X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcpu.c;h=c9462506dca025a633ccf3f591de8c23f2671c1a;hb=59547eb66a3743ca0b458222d7a4318f3e659a60;hp=bee6f177c11a6f3a3c81535de070e4b0e25b8088;hpb=808628cb56efc436dbeb63ea79381a62e9354b10;p=collectd.git

diff --git a/src/cpu.c b/src/cpu.c
index bee6f177..c9462506 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -221,18 +221,26 @@ static int init (void)
 
 	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)
@@ -419,6 +427,9 @@ static void aggregate (gauge_t *sum_by_state) /* {{{ */
 				RATE_ADD (this_cpu_states[COLLECTD_CPU_STATE_ACTIVE].rate, this_cpu_states[state].rate);
 		}
 
+		if (!isnan (this_cpu_states[COLLECTD_CPU_STATE_ACTIVE].rate))
+			this_cpu_states[COLLECTD_CPU_STATE_ACTIVE].has_value = 1;
+
 		RATE_ADD (sum_by_state[COLLECTD_CPU_STATE_ACTIVE], this_cpu_states[COLLECTD_CPU_STATE_ACTIVE].rate);
 	}
 } /* }}} void aggregate */
@@ -471,29 +482,15 @@ static void cpu_commit_without_aggregation (void) /* {{{ */
 	for (state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++)
 	{
 		size_t cpu_num;
-		if (report_by_cpu) {
-			for (cpu_num = 0; cpu_num < global_cpu_num; cpu_num++)
-			{
-				cpu_state_t *s = get_cpu_state (cpu_num, state);
 
-				if (!s->has_value)
-					continue;
-
-				submit_derive ((int) cpu_num, (int) state, s->conv.last_value.derive);
-			}
-		} else {
-			derive_t derive_total = 0;
-			for (cpu_num = 0; cpu_num < global_cpu_num; cpu_num++)
-				{
-					cpu_state_t *s = get_cpu_state (cpu_num, state);
-
-					if (!s->has_value)
-						continue;
+		for (cpu_num = 0; cpu_num < global_cpu_num; cpu_num++)
+		{
+			cpu_state_t *s = get_cpu_state (cpu_num, state);
 
-					derive_total += s->conv.last_value.derive;
+			if (!s->has_value)
+				continue;
 
-				}
-			submit_derive (-1, (int) state, derive_total);
+			submit_derive ((int) cpu_num, (int) state, s->conv.last_value.derive);
 		}
 	}
 } /* }}} void cpu_commit_without_aggregation */
@@ -502,11 +499,11 @@ static void cpu_commit_without_aggregation (void) /* {{{ */
 static void cpu_commit (void) /* {{{ */
 {
 	gauge_t global_rates[COLLECTD_CPU_STATE_MAX] = {
-		NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN
+		NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN /* Batman! */
 	};
 	size_t cpu_num;
 
-	if (report_by_state && !report_percent)
+	if (report_by_state && report_by_cpu && !report_percent)
 	{
 		cpu_commit_without_aggregation ();
 		return;
@@ -528,7 +525,7 @@ static void cpu_commit (void) /* {{{ */
 		};
 		size_t state;
 
-		for (state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++)
+		for (state = 0; state < COLLECTD_CPU_STATE_MAX; state++)
 			if (this_cpu_states[state].has_value)
 				local_rates[state] = this_cpu_states[state].rate;
 
@@ -595,16 +592,16 @@ static int cpu_read (void)
 			continue;
 		}
 
-		if (cpu_info_len < COLLECTD_CPU_STATE_MAX)
+		if (cpu_info_len < CPU_STATE_MAX)
 		{
 			ERROR ("cpu plugin: processor_info returned only %i elements..", cpu_info_len);
 			continue;
 		}
 
-		cpu_stage (cpu, COLLECTD_CPU_STATE_USER,   (derive_t) cpu_info.cpu_ticks[COLLECTD_CPU_STATE_USER],   now);
-		cpu_stage (cpu, COLLECTD_CPU_STATE_NICE,   (derive_t) cpu_info.cpu_ticks[COLLECTD_CPU_STATE_NICE],   now);
-		cpu_stage (cpu, COLLECTD_CPU_STATE_SYSTEM, (derive_t) cpu_info.cpu_ticks[COLLECTD_CPU_STATE_SYSTEM], now);
-		cpu_stage (cpu, COLLECTD_CPU_STATE_IDLE,   (derive_t) cpu_info.cpu_ticks[COLLECTD_CPU_STATE_IDLE],   now);
+		cpu_stage (cpu, COLLECTD_CPU_STATE_USER,   (derive_t) cpu_info.cpu_ticks[CPU_STATE_USER],   now);
+		cpu_stage (cpu, COLLECTD_CPU_STATE_NICE,   (derive_t) cpu_info.cpu_ticks[CPU_STATE_NICE],   now);
+		cpu_stage (cpu, COLLECTD_CPU_STATE_SYSTEM, (derive_t) cpu_info.cpu_ticks[CPU_STATE_SYSTEM], now);
+		cpu_stage (cpu, COLLECTD_CPU_STATE_IDLE,   (derive_t) cpu_info.cpu_ticks[CPU_STATE_IDLE],   now);
 	}
 /* }}} #endif PROCESSOR_CPU_LOAD_INFO */