X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcpu.c;h=1ac5b4a3b94a9cea50835485befc4adf7c934b88;hb=5523a080010dcb7a61dc0dccc3969a2a048e52f9;hp=9c432d1791d0090191842aa364c48d761b5da72e;hpb=6600bd1351bf81e0831e7ad95ee37a7b28cbdf94;p=collectd.git

diff --git a/src/cpu.c b/src/cpu.c
index 9c432d17..1ac5b4a3 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -28,6 +28,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -191,11 +192,13 @@ static size_t global_cpu_num = 0;
 static _Bool report_by_cpu = 1;
 static _Bool report_by_state = 1;
 static _Bool report_percent = 0;
+static _Bool report_num_cpu = 0;
 
 static const char *config_keys[] =
 {
 	"ReportByCpu",
 	"ReportByState",
+	"ReportNumCpu",
 	"ValuesPercentage"
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
@@ -208,6 +211,8 @@ static int cpu_config (char const *key, char const *value) /* {{{ */
 		report_percent = IS_TRUE (value) ? 1 : 0;
 	else if (strcasecmp (key, "ReportByState") == 0)
 		report_by_state = IS_TRUE (value) ? 1 : 0;
+	else if (strcasecmp (key, "ReportNumCpu") == 0)
+		report_num_cpu = IS_TRUE (value) ? 1 : 0;
 	else
 		return (-1);
 
@@ -405,19 +410,16 @@ static cpu_state_t *get_cpu_state (size_t cpu_num, size_t state) /* {{{ */
  * array. */
 static void aggregate (gauge_t *sum_by_state) /* {{{ */
 {
-	size_t cpu_num;
-	size_t state;
-
-	for (state = 0; state < COLLECTD_CPU_STATE_MAX; state++)
+	for (size_t state = 0; state < COLLECTD_CPU_STATE_MAX; state++)
 		sum_by_state[state] = NAN;
 
-	for (cpu_num = 0; cpu_num < global_cpu_num; cpu_num++)
+	for (size_t cpu_num = 0; cpu_num < global_cpu_num; cpu_num++)
 	{
 		cpu_state_t *this_cpu_states = get_cpu_state (cpu_num, 0);
 
 		this_cpu_states[COLLECTD_CPU_STATE_ACTIVE].rate = NAN;
 
-		for (state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++)
+		for (size_t state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++)
 		{
 			if (!this_cpu_states[state].has_value)
 				continue;
@@ -442,7 +444,6 @@ static void aggregate (gauge_t *sum_by_state) /* {{{ */
 static void cpu_commit_one (int cpu_num, /* {{{ */
 		gauge_t rates[static COLLECTD_CPU_STATE_MAX])
 {
-	size_t state;
 	gauge_t sum;
 
 	sum = rates[COLLECTD_CPU_STATE_ACTIVE];
@@ -455,20 +456,36 @@ static void cpu_commit_one (int cpu_num, /* {{{ */
 		return;
 	}
 
-	for (state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++)
+	for (size_t state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++)
 	{
 		gauge_t percent = 100.0 * rates[state] / sum;
 		submit_percent (cpu_num, state, percent);
 	}
 } /* }}} void cpu_commit_one */
 
+/* Commits the number of cores */
+static void cpu_commit_num_cpu (gauge_t num_cpu) /* {{{ */
+{
+	value_t values[1];
+	value_list_t vl = VALUE_LIST_INIT;
+
+	values[0].gauge = num_cpu;
+
+	vl.values = values;
+	vl.values_len = 1;
+
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "cpu", sizeof (vl.plugin));
+	sstrncpy (vl.type, "count", sizeof (vl.type));
+
+	plugin_dispatch_values (&vl);
+} /* }}} void cpu_commit_num_cpu */
+
 /* Resets the internal aggregation. This is called by the read callback after
  * each iteration / after each call to cpu_commit(). */
 static void cpu_reset (void) /* {{{ */
 {
-	size_t i;
-
-	for (i = 0; i < cpu_states_num; i++)
+	for (size_t i = 0; i < cpu_states_num; i++)
 		cpu_states[i].has_value = 0;
 
 	global_cpu_num = 0;
@@ -477,13 +494,9 @@ static void cpu_reset (void) /* {{{ */
 /* Legacy behavior: Dispatches the raw derive values without any aggregation. */
 static void cpu_commit_without_aggregation (void) /* {{{ */
 {
-	int state;
-
-	for (state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++)
+	for (int state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++)
 	{
-		size_t cpu_num;
-
-		for (cpu_num = 0; cpu_num < global_cpu_num; cpu_num++)
+		for (size_t cpu_num = 0; cpu_num < global_cpu_num; cpu_num++)
 		{
 			cpu_state_t *s = get_cpu_state (cpu_num, state);
 
@@ -501,7 +514,9 @@ static void cpu_commit (void) /* {{{ */
 	gauge_t global_rates[COLLECTD_CPU_STATE_MAX] = {
 		NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN /* Batman! */
 	};
-	size_t cpu_num;
+
+	if (report_num_cpu)
+		cpu_commit_num_cpu ((gauge_t) global_cpu_num);
 
 	if (report_by_state && report_by_cpu && !report_percent)
 	{
@@ -517,15 +532,14 @@ static void cpu_commit (void) /* {{{ */
 		return;
 	}
 
-	for (cpu_num = 0; cpu_num < global_cpu_num; cpu_num++)
+	for (size_t cpu_num = 0; cpu_num < global_cpu_num; cpu_num++)
 	{
 		cpu_state_t *this_cpu_states = get_cpu_state (cpu_num, 0);
 		gauge_t local_rates[COLLECTD_CPU_STATE_MAX] = {
 			NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN
 		};
-		size_t state;
 
-		for (state = 0; state < COLLECTD_CPU_STATE_MAX; state++)
+		for (size_t state = 0; state < COLLECTD_CPU_STATE_MAX; state++)
 			if (this_cpu_states[state].has_value)
 				local_rates[state] = this_cpu_states[state].rate;
 
@@ -569,8 +583,6 @@ static int cpu_read (void)
 	cdtime_t now = cdtime ();
 
 #if PROCESSOR_CPU_LOAD_INFO /* {{{ */
-	int cpu;
-
 	kern_return_t status;
 
 	processor_cpu_load_info_data_t cpu_info;
@@ -578,7 +590,7 @@ static int cpu_read (void)
 
 	host_t cpu_host;
 
-	for (cpu = 0; cpu < cpu_list_len; cpu++)
+	for (mach_msg_type_number_t cpu = 0; cpu < cpu_list_len; cpu++)
 	{
 		cpu_host = 0;
 		cpu_info_len = PROCESSOR_BASIC_INFO_COUNT;
@@ -653,13 +665,12 @@ static int cpu_read (void)
 /* }}} #endif defined(KERNEL_LINUX) */
 
 #elif defined(HAVE_LIBKSTAT) /* {{{ */
-	int cpu;
 	static cpu_stat_t cs;
 
 	if (kc == NULL)
 		return (-1);
 
-	for (cpu = 0; cpu < numcpu; cpu++)
+	for (int cpu = 0; cpu < numcpu; cpu++)
 	{
 		if (kstat_read (kc, ksp[cpu], &cs) == -1)
 			continue; /* error message? */
@@ -675,7 +686,6 @@ static int cpu_read (void)
 	uint64_t cpuinfo[numcpu][CPUSTATES];
 	size_t cpuinfo_size;
 	int status;
-	int i;
 
 	if (numcpu < 1)
 	{
@@ -688,7 +698,7 @@ static int cpu_read (void)
 
 #if defined(KERN_CPTIME2)
 	if (numcpu > 1) {
-		for (i = 0; i < numcpu; i++) {
+		for (int i = 0; i < numcpu; i++) {
 			int mib[] = {CTL_KERN, KERN_CPTIME2, i};
 
 			cpuinfo_size = sizeof (cpuinfo[0]);
@@ -721,12 +731,12 @@ static int cpu_read (void)
 			return (-1);
 		}
 
-		for(i = 0; i < CPUSTATES; i++) {
+		for(int i = 0; i < CPUSTATES; i++) {
 			cpuinfo[0][i] = cpuinfo_tmp[i];
 		}
 	}
 
-	for (i = 0; i < numcpu; i++) {
+	for (int i = 0; i < numcpu; i++) {
 		cpu_stage (i, COLLECTD_CPU_STATE_USER,      (derive_t) cpuinfo[i][CP_USER], now);
 		cpu_stage (i, COLLECTD_CPU_STATE_NICE,      (derive_t) cpuinfo[i][CP_NICE], now);
 		cpu_stage (i, COLLECTD_CPU_STATE_SYSTEM,    (derive_t) cpuinfo[i][CP_SYS], now);
@@ -738,7 +748,6 @@ static int cpu_read (void)
 #elif defined(HAVE_SYSCTLBYNAME) && defined(HAVE_SYSCTL_KERN_CP_TIMES) /* {{{ */
 	long cpuinfo[maxcpu][CPUSTATES];
 	size_t cpuinfo_size;
-	int i;
 
 	memset (cpuinfo, 0, sizeof (cpuinfo));
 
@@ -751,7 +760,7 @@ static int cpu_read (void)
 		return (-1);
 	}
 
-	for (i = 0; i < numcpu; i++) {
+	for (int i = 0; i < numcpu; i++) {
 		cpu_stage (i, COLLECTD_CPU_STATE_USER,      (derive_t) cpuinfo[i][CP_USER], now);
 		cpu_stage (i, COLLECTD_CPU_STATE_NICE,      (derive_t) cpuinfo[i][CP_NICE], now);
 		cpu_stage (i, COLLECTD_CPU_STATE_SYSTEM,    (derive_t) cpuinfo[i][CP_SYS], now);
@@ -801,7 +810,7 @@ static int cpu_read (void)
 
 #elif defined(HAVE_PERFSTAT) /* {{{ */
 	perfstat_id_t id;
-	int i, cpus;
+	int cpus;
 
 	numcpu =  perfstat_cpu(NULL, NULL, sizeof(perfstat_cpu_t), 0);
 	if(numcpu == -1)
@@ -828,7 +837,7 @@ static int cpu_read (void)
 		return (-1);
 	}
 
-	for (i = 0; i < cpus; i++)
+	for (int i = 0; i < cpus; i++)
 	{
 		cpu_stage (i, COLLECTD_CPU_STATE_IDLE,   (derive_t) perfcpu[i].idle, now);
 		cpu_stage (i, COLLECTD_CPU_STATE_SYSTEM, (derive_t) perfcpu[i].sys,  now);