projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #900 from ccin2p3/faxmodem/cpu-numcpu
[collectd.git]
/
src
/
cpu.c
diff --git
a/src/cpu.c
b/src/cpu.c
index
d194872
..
c856605
100644
(file)
--- a/
src/cpu.c
+++ b/
src/cpu.c
@@
-466,11
+466,9
@@
static void cpu_commit_one (int cpu_num, /* {{{ */
/* Commits the number of cores */
static void cpu_commit_num_cpu (gauge_t num_cpu) /* {{{ */
{
/* Commits the number of cores */
static void cpu_commit_num_cpu (gauge_t num_cpu) /* {{{ */
{
-//// 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;
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
- /// memcpy(&values[0], &value, sizeof(value));
values[0].gauge = num_cpu;
vl.values = values;
values[0].gauge = num_cpu;
vl.values = values;
@@
-478,9
+476,7
@@
static void cpu_commit_num_cpu (gauge_t num_cpu) /* {{{ */
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "cpu", sizeof (vl.plugin));
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "cpu", sizeof (vl.plugin));
- sstrncpy (vl.type, "gauge", sizeof (vl.type));
- sstrncpy (vl.type_instance, "ncpu",
- sizeof (vl.type_instance));
+ sstrncpy (vl.type, "count", sizeof (vl.type));
plugin_dispatch_values (&vl);
} /* }}} void cpu_commit_num_cpu */
plugin_dispatch_values (&vl);
} /* }}} void cpu_commit_num_cpu */
@@
-520,9
+516,7
@@
static void cpu_commit (void) /* {{{ */
};
if (report_num_cpu)
};
if (report_num_cpu)
- {
cpu_commit_num_cpu ((gauge_t) global_cpu_num);
cpu_commit_num_cpu ((gauge_t) global_cpu_num);
- }
if (report_by_state && report_by_cpu && !report_percent)
{
if (report_by_state && report_by_cpu && !report_percent)
{