X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcpu.c;h=ba0c1b1a2880db85195a77b6bf67c7a82edc5dc6;hb=edc842a72e095b67348ed96d287c857ead49d229;hp=d9453aa31f95d403870f343d642636b487917ad6;hpb=bf9c97e68ca17b33fc1f4968fddff313ede5b24d;p=collectd.git

diff --git a/src/cpu.c b/src/cpu.c
index d9453aa3..ba0c1b1a 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -22,7 +22,6 @@
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
-#include "utils_debug.h"
 
 #ifdef HAVE_MACH_KERN_RETURN_H
 # include <mach/kern_return.h>
@@ -69,27 +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[5] =
-{
-	{"user", DS_TYPE_COUNTER, 0, 4294967295.0},
-	{"nice", DS_TYPE_COUNTER, 0, 4294967295.0},
-	{"syst", DS_TYPE_COUNTER, 0, 4294967295.0},
-	{"idle", DS_TYPE_COUNTER, 0, 4294967295.0},
-	{"wait", DS_TYPE_COUNTER, 0, 4294967295.0}
-};
-
-static data_set_t ds =
-{
-	"cpu", 5, dsrc
-};
-
-#if CPU_HAVE_READ
 #ifdef PROCESSOR_CPU_LOAD_INFO
 static mach_port_t port_host;
 static processor_port_array_t cpu_list;
@@ -122,25 +104,21 @@ static int init (void)
 {
 #if PROCESSOR_CPU_LOAD_INFO || PROCESSOR_TEMPERATURE
 	kern_return_t status;
-	int collectd_step;
 
 	port_host = mach_host_self ();
 
 	/* FIXME: Free `cpu_list' if it's not NULL */
 	if ((status = host_processors (port_host, &cpu_list, &cpu_list_len)) != KERN_SUCCESS)
 	{
-		syslog (LOG_ERR, "cpu plugin: host_processors returned %i\n", (int) status);
+		ERROR ("cpu plugin: host_processors returned %i", (int) status);
 		cpu_list_len = 0;
 		return (-1);
 	}
 
-	DBG ("host_processors returned %i %s", (int) cpu_list_len, cpu_list_len == 1 ? "processor" : "processors");
-	syslog (LOG_INFO, "cpu plugin: Found %i processor%s.", (int) cpu_list_len, cpu_list_len == 1 ? "" : "s");
+	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)
@@ -166,39 +144,35 @@ static int init (void)
 
 	if (sysctlbyname ("hw.ncpu", &numcpu, &numcpu_size, NULL, 0) < 0)
 	{
-		syslog (LOG_WARNING, "cpu: sysctlbyname: %s", strerror (errno));
+		char errbuf[1024];
+		WARNING ("cpu plugin: sysctlbyname: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
 		return (-1);
 	}
 
 	if (numcpu != 1)
-		syslog (LOG_NOTICE, "cpu: Only one processor supported when using `sysctlbyname' (found %i)", numcpu);
+		NOTICE ("cpu: Only one processor supported when using `sysctlbyname' (found %i)", numcpu);
 #endif
 
 	return (0);
 } /* int init */
 
-static void submit (int cpu_num, unsigned long long user,
-		unsigned long long nice, unsigned long long syst,
-		unsigned long long idle, unsigned long long wait)
+static void submit (int cpu_num, const char *type_instance, counter_t value)
 {
-	value_t values[5];
+	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].counter = user;
-	values[1].counter = nice;
-	values[2].counter = syst;
-	values[3].counter = idle;
-	values[4].counter = wait;
+	values[0].counter = value;
 
 	vl.values = values;
-	vl.values_len = 2;
+	vl.values_len = 1;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname);
+	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "cpu");
-	strcpy (vl.plugin_instance, "");
-	snprintf (vl.type_instance, sizeof (vl.type_instance),
+	snprintf (vl.plugin_instance, sizeof (vl.type_instance),
 			"%i", cpu_num);
-	vl.type_instance[DATA_MAX_NAME_LEN - 1] = '\0';
+	vl.plugin_instance[DATA_MAX_NAME_LEN - 1] = '\0';
+	strcpy (vl.type_instance, type_instance);
 
 	plugin_dispatch_values ("cpu", &vl);
 }
@@ -231,21 +205,20 @@ static int cpu_read (void)
 						PROCESSOR_CPU_LOAD_INFO, &cpu_host,
 						(processor_info_t) &cpu_info, &cpu_info_len)) != KERN_SUCCESS)
 		{
-			syslog (LOG_ERR, "cpu plugin: processor_info failed with status %i", (int) status);
+			ERROR ("cpu plugin: processor_info failed with status %i", (int) status);
 			continue;
 		}
 
 		if (cpu_info_len < CPU_STATE_MAX)
 		{
-			syslog (LOG_ERR, "cpu plugin: processor_info returned only %i elements..", cpu_info_len);
+			ERROR ("cpu plugin: processor_info returned only %i elements..", cpu_info_len);
 			continue;
 		}
 
-		submit (cpu, cpu_info.cpu_ticks[CPU_STATE_USER],
-				cpu_info.cpu_ticks[CPU_STATE_NICE],
-				cpu_info.cpu_ticks[CPU_STATE_SYSTEM],
-				cpu_info.cpu_ticks[CPU_STATE_IDLE],
-				0ULL);
+		submit (cpu, "user", (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
 		/*
@@ -268,7 +241,7 @@ static int cpu_read (void)
 				cpu_temp, &cpu_temp_len);
 		if (status != KERN_SUCCESS)
 		{
-			syslog (LOG_ERR, "cpu plugin: processor_info failed: %s",
+			ERROR ("cpu plugin: processor_info failed: %s",
 					mach_error_string (status));
 
 			cpu_temp_retry_counter = cpu_temp_retry_step;
@@ -281,7 +254,7 @@ static int cpu_read (void)
 
 		if (cpu_temp_len != 1)
 		{
-			DBG ("processor_info (PROCESSOR_TEMPERATURE) returned %i elements..?",
+			DEBUG ("processor_info (PROCESSOR_TEMPERATURE) returned %i elements..?",
 				       	(int) cpu_temp_len);
 			continue;
 		}
@@ -289,15 +262,15 @@ static int cpu_read (void)
 		cpu_temp_retry_counter = 0;
 		cpu_temp_retry_step    = 1;
 
-		DBG ("cpu_temp = %i", (int) cpu_temp);
+		DEBUG ("cpu_temp = %i", (int) cpu_temp);
 #endif /* PROCESSOR_TEMPERATURE */
 	}
 /* #endif PROCESSOR_CPU_LOAD_INFO */
 
 #elif defined(KERNEL_LINUX)
 	int cpu;
-	unsigned long long user, nice, syst, idle;
-	unsigned long long wait, intr, sitr; /* sitr == soft interrupt */
+	counter_t user, nice, syst, idle;
+	counter_t wait, intr, sitr; /* sitr == soft interrupt */
 	FILE *fh;
 	char buf[1024];
 
@@ -308,9 +281,10 @@ static int cpu_read (void)
 
 	if ((fh = fopen ("/proc/stat", "r")) == NULL)
 	{
+		char errbuf[1024];
 		plugin_complain (LOG_ERR, &complain_obj, "cpu plugin: "
 				"fopen (/proc/stat) failed: %s",
-				strerror (errno));
+				sstrerror (errno, errbuf, sizeof (errbuf)));
 		return (-1);
 	}
 
@@ -334,22 +308,24 @@ static int cpu_read (void)
 		syst = atoll (fields[3]);
 		idle = atoll (fields[4]);
 
+		submit (cpu, "user", user);
+		submit (cpu, "nice", nice);
+		submit (cpu, "system", syst);
+		submit (cpu, "idle", idle);
+
 		if (numfields >= 8)
 		{
 			wait = atoll (fields[5]);
 			intr = atoll (fields[6]);
 			sitr = atoll (fields[7]);
 
-			/* I doubt anyone cares about the time spent in
-			 * interrupt handlers.. */
-			syst += intr + sitr;
-		}
-		else
-		{
-			wait = 0LL;
-		}
+			submit (cpu, "wait", wait);
+			submit (cpu, "interrupt", intr);
+			submit (cpu, "softirq", sitr);
 
-		submit (cpu, user, nice, syst, idle, wait);
+			if (numfields >= 9)
+				submit (cpu, "steal", atoll (fields[8]));
+		}
 	}
 
 	fclose (fh);
@@ -357,24 +333,26 @@ static int cpu_read (void)
 
 #elif defined(HAVE_LIBKSTAT)
 	int cpu;
-	unsigned long long user, syst, idle, wait;
+	counter_t user, syst, idle, wait;
 	static cpu_stat_t cs;
 
 	if (kc == NULL)
-		return;
+		return (-1);
 
 	for (cpu = 0; cpu < numcpu; cpu++)
 	{
 		if (kstat_read (kc, ksp[cpu], &cs) == -1)
 			continue; /* error message? */
 
-		idle = (unsigned long long) cs.cpu_sysinfo.cpu[CPU_IDLE];
-		user = (unsigned long long) cs.cpu_sysinfo.cpu[CPU_USER];
-		syst = (unsigned long long) cs.cpu_sysinfo.cpu[CPU_KERNEL];
-		wait = (unsigned long long) cs.cpu_sysinfo.cpu[CPU_WAIT];
+		idle = (counter_t) cs.cpu_sysinfo.cpu[CPU_IDLE];
+		user = (counter_t) cs.cpu_sysinfo.cpu[CPU_USER];
+		syst = (counter_t) cs.cpu_sysinfo.cpu[CPU_KERNEL];
+		wait = (counter_t) cs.cpu_sysinfo.cpu[CPU_WAIT];
 
-		submit (ksp[cpu]->ks_instance,
-				user, 0LL, syst, idle, wait);
+		submit (ksp[cpu]->ks_instance, "user", user);
+		submit (ksp[cpu]->ks_instance, "system", syst);
+		submit (ksp[cpu]->ks_instance, "idle", idle);
+		submit (ksp[cpu]->ks_instance, "wait", wait);
 	}
 /* #endif defined(HAVE_LIBKSTAT) */
 
@@ -388,10 +366,11 @@ static int cpu_read (void)
 
 	if (sysctlbyname("kern.cp_time", &cpuinfo, &cpuinfo_size, NULL, 0) < 0)
 	{
+		char errbuf[1024];
 		plugin_complain (LOG_ERR, &complain_obj, "cpu plugin: "
 				"sysctlbyname failed: %s.",
-				strerror (errno));
-		return;
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		return (-1);
 	}
 
 	plugin_relief (LOG_NOTICE, &complain_obj, "cpu plugin: "
@@ -399,20 +378,17 @@ static int cpu_read (void)
 
 	cpuinfo[CP_SYS] += cpuinfo[CP_INTR];
 
-	/* FIXME: Instance is always `0' */
-	submit (0, cpuinfo[CP_USER], cpuinfo[CP_NICE], cpuinfo[CP_SYS], cpuinfo[CP_IDLE], 0LL);
+	submit (0, "user", cpuinfo[CP_USER]);
+	submit (0, "nice", cpuinfo[CP_NICE]);
+	submit (0, "system", cpuinfo[CP_SYS]);
+	submit (0, "idle", cpuinfo[CP_IDLE]);
 #endif
 
 	return (0);
 }
-#endif /* CPU_HAVE_READ */
 
 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 */