X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcpu.c;h=99e7a6699a11625edf1d16891fe85a00244e61de;hb=4256c346a988d202b31442f6837d2672af80798b;hp=1dcbdcd2b39b0d323aba0cdf4ea212bc117cc4bf;hpb=39d723f4cb1d50b7ebb90c3251f0ebabad576412;p=collectd.git

diff --git a/src/cpu.c b/src/cpu.c
index 1dcbdcd2..99e7a669 100644
--- 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;
@@ -117,7 +107,6 @@ static int init (void)
 {
 #if PROCESSOR_CPU_LOAD_INFO || PROCESSOR_TEMPERATURE
 	kern_return_t status;
-	int collectd_step;
 
 	port_host = mach_host_self ();
 
@@ -132,10 +121,7 @@ static int init (void)
 	DEBUG ("host_processors returned %i %s", (int) cpu_list_len, cpu_list_len == 1 ? "processor" : "processors");
 	INFO ("cpu plugin: Found %i processor%s.", (int) cpu_list_len, cpu_list_len == 1 ? "" : "s");
 
-	collectd_step = atoi (COLLECTD_STEP);
-	if ((collectd_step > 0) && (collectd_step <= 86400))
-		cpu_temp_retry_max = 86400 / collectd_step;
-		
+	cpu_temp_retry_max = 86400 / interval_g;
 /* #endif PROCESSOR_CPU_LOAD_INFO */
 
 #elif defined(HAVE_LIBKSTAT)
@@ -339,6 +325,9 @@ static int cpu_read (void)
 			submit (cpu, "wait", wait);
 			submit (cpu, "interrupt", intr);
 			submit (cpu, "softirq", sitr);
+
+			if (numfields >= 9)
+				submit (cpu, "steal", atoll (fields[8]));
 		}
 	}
 
@@ -384,7 +373,7 @@ static int cpu_read (void)
 		plugin_complain (LOG_ERR, &complain_obj, "cpu plugin: "
 				"sysctlbyname failed: %s.",
 				sstrerror (errno, errbuf, sizeof (errbuf)));
-		return;
+		return (-1);
 	}
 
 	plugin_relief (LOG_NOTICE, &complain_obj, "cpu plugin: "
@@ -404,10 +393,8 @@ static int cpu_read (void)
 
 void module_register (void)
 {
-	plugin_register_data_set (&ds);
-
 #if CPU_HAVE_READ
 	plugin_register_init ("cpu", init);
 	plugin_register_read ("cpu", cpu_read);
 #endif /* CPU_HAVE_READ */
-}
+} /* void module_register */