X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcpu.c;h=ba0c1b1a2880db85195a77b6bf67c7a82edc5dc6;hb=60172edc441eb64206aa1942576128bc07369f5f;hp=1dc78657ad2fe4e01b8fdfaaf3cb2ee06e75d310;hpb=6dee31bca87a552017791aa97afa9bd40bc0ebfe;p=collectd.git

diff --git a/src/cpu.c b/src/cpu.c
index 1dc78657..ba0c1b1a 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -68,23 +68,10 @@
 # endif
 #endif /* HAVE_SYSCTLBYNAME */
 
-#if defined(PROCESSOR_CPU_LOAD_INFO) || defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) || defined(HAVE_SYSCTLBYNAME)
-# define CPU_HAVE_READ 1
-#else
-# define CPU_HAVE_READ 0
+#if !PROCESSOR_CPU_LOAD_INFO && !KERNEL_LINUX && !HAVE_LIBKSTAT && !HAVE_SYSCTLBYNAME
+# error "No applicable input method."
 #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;
 static processor_port_array_t cpu_list;
@@ -117,7 +104,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 +118,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)
@@ -233,9 +216,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
 		/*
@@ -339,6 +322,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]));
 		}
 	}
 
@@ -351,7 +337,7 @@ static int cpu_read (void)
 	static cpu_stat_t cs;
 
 	if (kc == NULL)
-		return;
+		return (-1);
 
 	for (cpu = 0; cpu < numcpu; cpu++)
 	{
@@ -384,7 +370,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: "
@@ -400,18 +386,9 @@ static int cpu_read (void)
 
 	return (0);
 }
-#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);
-	}
-#endif /* CPU_HAVE_READ */
+	plugin_register_init ("cpu", init);
+	plugin_register_read ("cpu", cpu_read);
 } /* void module_register */