Merge branch 'pr/1792'

[collectd.git] / src / cpu.c

diff --git a/src/cpu.c b/src/cpu.c
index 8002966..fbd0714 100644 (file)
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -192,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);
@@ -209,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);
 
@@ -321,12 +325,9 @@ static int init (void)
 
 static void submit_value (int cpu_num, int cpu_state, const char *type, value_t value)
 {
-       value_t values[1];
        value_list_t vl = VALUE_LIST_INIT;
 
-       memcpy(&values[0], &value, sizeof(value));
-
-       vl.values = values;
+       vl.values = &value;
        vl.values_len = 1;
 
        sstrncpy (vl.host, hostname_g, sizeof (vl.host));
@@ -342,26 +343,22 @@ static void submit_value (int cpu_num, int cpu_state, const char *type, value_t
        plugin_dispatch_values (&vl);
 }
 
-static void submit_percent(int cpu_num, int cpu_state, gauge_t percent)
+static void submit_percent (int cpu_num, int cpu_state, gauge_t value)
 {
-       value_t value;
-
        /* This function is called for all known CPU states, but each read
         * method will only report a subset. The remaining states are left as
         * NAN and we ignore them here. */
-       if (isnan (percent))
+       if (isnan (value))
                return;
 
-       value.gauge = percent;
-       submit_value (cpu_num, cpu_state, "percent", value);
+       submit_value (cpu_num, cpu_state, "percent",
+                       (value_t) { .gauge = value });
 }
 
-static void submit_derive(int cpu_num, int cpu_state, derive_t derive)
+static void submit_derive (int cpu_num, int cpu_state, derive_t value)
 {
-       value_t value;
-
-       value.derive = derive;
-       submit_value (cpu_num, cpu_state, "cpu", value);
+       submit_value (cpu_num, cpu_state, "cpu",
+                       (value_t) { .derive = value });
 }
 
 /* Takes the zero-index number of a CPU and makes sure that the module-global
@@ -459,6 +456,21 @@ static void cpu_commit_one (int cpu_num, /* {{{ */
        }
 } /* }}} void cpu_commit_one */
 
+/* Commits the number of cores */
+static void cpu_commit_num_cpu (gauge_t value) /* {{{ */
+{
+       value_list_t vl = VALUE_LIST_INIT;
+
+       vl.values = &(value_t) { .gauge = value };
+       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) /* {{{ */
@@ -493,6 +505,9 @@ static void cpu_commit (void) /* {{{ */
                NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN /* Batman! */
        };
 
+       if (report_num_cpu)
+               cpu_commit_num_cpu ((gauge_t) global_cpu_num);
+
        if (report_by_state && report_by_cpu && !report_percent)
        {
                cpu_commit_without_aggregation ();
@@ -530,7 +545,7 @@ static int cpu_stage (size_t cpu_num, size_t state, derive_t d, cdtime_t now) /*
        int status;
        cpu_state_t *s;
        gauge_t rate = NAN;
-       value_t val = {.derive = d};
+       value_t val = { .derive = d };
 
        if (state >= COLLECTD_CPU_STATE_ACTIVE)
                return (EINVAL);
@@ -565,7 +580,7 @@ static int cpu_read (void)
 
        host_t cpu_host;
 
-       for (int 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;