author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
Fri, 12 Aug 2016 11:15:28 +0000 (13:15 +0200) | ||
committer | GitHub <noreply@github.com> | |
Fri, 12 Aug 2016 11:15:28 +0000 (13:15 +0200) |
implement reporting of ncpu
src/collectd.conf.pod | patch | blob | history | |
src/cpu.c | patch | blob | history |
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 9ae73106de75ac1a445f60799ff3f71f3a115bd4..6d1547a63f3b523ebfe222b969e706a48c65fa31 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
Jiffies. By setting this option to B<true>, you can request percentage values
in the un-aggregated (per-CPU, per-state) mode as well.
+=item B<ReportNumCpu> B<false>|B<true>
+
+When set to B<true>, reports the number of available CPUs.
+Defaults to B<false>.
+
=back
=head2 Plugin C<cpufreq>
diff --git a/src/cpu.c b/src/cpu.c
index 80029667af80d39950fe06f1d0482455f70ff92c..c85660593497cc8e202dc344996362227e3357b2 100644 (file)
--- a/src/cpu.c
+++ b/src/cpu.c
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);
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);
}
} /* }}} 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) /* {{{ */
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 ();