Merge branch 'collectd-3.11' into collectd-4.0

[collectd.git] / src / cpu.c

diff --git a/src/cpu.c b/src/cpu.c
index d774ca4..cbdde1e 100644 (file)
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -74,16 +74,6 @@
 # define CPU_HAVE_READ 0
 #endif
 
-static data_source_t dsrc[1] =
-{
-       {"value", DS_TYPE_COUNTER, 0, 4294967295.0}
-};
-
-static data_set_t ds =
-{
-       "cpu", 1, dsrc
-};
-
 #if CPU_HAVE_READ
 #ifdef PROCESSOR_CPU_LOAD_INFO
 static mach_port_t port_host;
@@ -229,9 +219,9 @@ static int cpu_read (void)
                }
 
                submit (cpu, "user", (counter_t) cpu_info.cpu_ticks[CPU_STATE_USER]);
-               submit (cpu, "nice", (counter_t) cpu_info.cpu_ticks[CPU_STATE_USER]);
-               submit (cpu, "system", (counter_t) cpu_info.cpu_ticks[CPU_STATE_USER]);
-               submit (cpu, "idle", (counter_t) cpu_info.cpu_ticks[CPU_STATE_USER]);
+               submit (cpu, "nice", (counter_t) cpu_info.cpu_ticks[CPU_STATE_NICE]);
+               submit (cpu, "system", (counter_t) cpu_info.cpu_ticks[CPU_STATE_SYSTEM]);
+               submit (cpu, "idle", (counter_t) cpu_info.cpu_ticks[CPU_STATE_IDLE]);
 #endif /* PROCESSOR_CPU_LOAD_INFO */
 #if PROCESSOR_TEMPERATURE
                /*
@@ -350,7 +340,7 @@ static int cpu_read (void)
        static cpu_stat_t cs;
 
        if (kc == NULL)
-               return;
+               return (-1);
 
        for (cpu = 0; cpu < numcpu; cpu++)
        {
@@ -401,16 +391,10 @@ static int cpu_read (void)
 }
 #endif /* CPU_HAVE_READ */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-       if (load & MR_DATASETS)
-               plugin_register_data_set (&ds);
-
 #if CPU_HAVE_READ
-       if (load & MR_READ)
-       {
-               plugin_register_init ("cpu", init);
-               plugin_register_read ("cpu", cpu_read);
-       }
+       plugin_register_init ("cpu", init);
+       plugin_register_read ("cpu", cpu_read);
 #endif /* CPU_HAVE_READ */
 } /* void module_register */