X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcpu.c;h=461a6e1bca64e653be62122cfb7c459b5a54228e;hb=9204a08464154faaca89690ad205989c121335cb;hp=2247d5fdc7ad377acebfb4b26ef883d473d5de5c;hpb=842c1a2d2a640151a89b9de7f4acd3b6a058c799;p=collectd.git

diff --git a/src/cpu.c b/src/cpu.c
index 2247d5fd..461a6e1b 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -104,12 +104,6 @@
 static mach_port_t port_host;
 static processor_port_array_t cpu_list;
 static mach_msg_type_number_t cpu_list_len;
-
-#if PROCESSOR_TEMPERATURE
-static int cpu_temp_retry_counter = 0;
-static int cpu_temp_retry_step    = 1;
-static int cpu_temp_retry_max     = 1;
-#endif /* PROCESSOR_TEMPERATURE */
 /* #endif PROCESSOR_CPU_LOAD_INFO */
 
 #elif defined(KERNEL_LINUX)
@@ -147,23 +141,31 @@ static int pnumcpu;
 
 static int init (void)
 {
-#if PROCESSOR_CPU_LOAD_INFO || PROCESSOR_TEMPERATURE
+#if PROCESSOR_CPU_LOAD_INFO
 	kern_return_t status;
 
 	port_host = mach_host_self ();
 
-	/* FIXME: Free `cpu_list' if it's not NULL */
-	if ((status = host_processors (port_host, &cpu_list, &cpu_list_len)) != KERN_SUCCESS)
+	status = host_processors (port_host, &cpu_list, &cpu_list_len);
+	if (status == KERN_INVALID_ARGUMENT)
 	{
-		ERROR ("cpu plugin: host_processors returned %i", (int) status);
+		ERROR ("cpu plugin: Don't have a privileged host control port. "
+				"The most common cause for this problem is "
+				"that collectd is running without root "
+				"privileges, which are required to read CPU "
+				"load information. "
+				"<https://collectd.org/bugs/22>");
+		cpu_list_len = 0;
+		return (-1);
+	}
+	if (status != KERN_SUCCESS)
+	{
+		ERROR ("cpu plugin: host_processors() failed with status %d.", (int) status);
 		cpu_list_len = 0;
 		return (-1);
 	}
 
-	DEBUG ("host_processors returned %i %s", (int) cpu_list_len, cpu_list_len == 1 ? "processor" : "processors");
 	INFO ("cpu plugin: Found %i processor%s.", (int) cpu_list_len, cpu_list_len == 1 ? "" : "s");
-
-	cpu_temp_retry_max = 86400 / CDTIME_T_TO_TIME_T (plugin_get_interval ());
 /* #endif PROCESSOR_CPU_LOAD_INFO */
 
 #elif defined(HAVE_LIBKSTAT)
@@ -262,33 +264,27 @@ static void submit (int cpu_num, const char *type_instance, derive_t value)
 
 static int cpu_read (void)
 {
-#if PROCESSOR_CPU_LOAD_INFO || PROCESSOR_TEMPERATURE
+#if PROCESSOR_CPU_LOAD_INFO
 	int cpu;
 
 	kern_return_t status;
-	
-#if PROCESSOR_CPU_LOAD_INFO
+
 	processor_cpu_load_info_data_t cpu_info;
 	mach_msg_type_number_t         cpu_info_len;
-#endif
-#if PROCESSOR_TEMPERATURE
-	processor_info_data_t          cpu_temp;
-	mach_msg_type_number_t         cpu_temp_len;
-#endif
 
 	host_t cpu_host;
 
 	for (cpu = 0; cpu < cpu_list_len; cpu++)
 	{
-#if PROCESSOR_CPU_LOAD_INFO
 		cpu_host = 0;
 		cpu_info_len = PROCESSOR_BASIC_INFO_COUNT;
 
-		if ((status = processor_info (cpu_list[cpu],
-						PROCESSOR_CPU_LOAD_INFO, &cpu_host,
-						(processor_info_t) &cpu_info, &cpu_info_len)) != KERN_SUCCESS)
+		status = processor_info (cpu_list[cpu], PROCESSOR_CPU_LOAD_INFO, &cpu_host,
+				(processor_info_t) &cpu_info, &cpu_info_len);
+		if (status != KERN_SUCCESS)
 		{
-			ERROR ("cpu plugin: processor_info failed with status %i", (int) status);
+			ERROR ("cpu plugin: processor_info (PROCESSOR_CPU_LOAD_INFO) failed: %s",
+					mach_error_string (status));
 			continue;
 		}
 
@@ -302,49 +298,6 @@ static int cpu_read (void)
 		submit (cpu, "nice", (derive_t) cpu_info.cpu_ticks[CPU_STATE_NICE]);
 		submit (cpu, "system", (derive_t) cpu_info.cpu_ticks[CPU_STATE_SYSTEM]);
 		submit (cpu, "idle", (derive_t) cpu_info.cpu_ticks[CPU_STATE_IDLE]);
-#endif /* PROCESSOR_CPU_LOAD_INFO */
-#if PROCESSOR_TEMPERATURE
-		/*
-		 * Not all Apple computers do have this ability. To minimize
-		 * the messages sent to the syslog we do an exponential
-		 * stepback if `processor_info' fails. We still try ~once a day
-		 * though..
-		 */
-		if (cpu_temp_retry_counter > 0)
-		{
-			cpu_temp_retry_counter--;
-			continue;
-		}
-
-		cpu_temp_len = PROCESSOR_INFO_MAX;
-
-		status = processor_info (cpu_list[cpu],
-				PROCESSOR_TEMPERATURE,
-				&cpu_host,
-				cpu_temp, &cpu_temp_len);
-		if (status != KERN_SUCCESS)
-		{
-			ERROR ("cpu plugin: processor_info failed: %s",
-					mach_error_string (status));
-
-			cpu_temp_retry_counter = cpu_temp_retry_step;
-			cpu_temp_retry_step *= 2;
-			if (cpu_temp_retry_step > cpu_temp_retry_max)
-				cpu_temp_retry_step = cpu_temp_retry_max;
-
-			continue;
-		}
-
-		if (cpu_temp_len != 1)
-		{
-			DEBUG ("processor_info (PROCESSOR_TEMPERATURE) returned %i elements..?",
-				       	(int) cpu_temp_len);
-			continue;
-		}
-
-		cpu_temp_retry_counter = 0;
-		cpu_temp_retry_step    = 1;
-#endif /* PROCESSOR_TEMPERATURE */
 	}
 /* #endif PROCESSOR_CPU_LOAD_INFO */
 
@@ -569,10 +522,10 @@ static int cpu_read (void)
 			sstrerror (errno, errbuf, sizeof (errbuf)));
 		return (-1);
 	}
-	
-	if (pnumcpu != numcpu || perfcpu == NULL) 
+
+	if (pnumcpu != numcpu || perfcpu == NULL)
 	{
-		if (perfcpu != NULL) 
+		if (perfcpu != NULL)
 			free(perfcpu);
 		perfcpu = malloc(numcpu * sizeof(perfstat_cpu_t));
 	}
@@ -587,7 +540,7 @@ static int cpu_read (void)
 		return (-1);
 	}
 
-	for (i = 0; i < cpus; i++) 
+	for (i = 0; i < cpus; i++)
 	{
 		submit (i, "idle",   (derive_t) perfcpu[i].idle);
 		submit (i, "system", (derive_t) perfcpu[i].sys);