X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcpu.c;h=ba0c1b1a2880db85195a77b6bf67c7a82edc5dc6;hb=505979b924801e0ac493d89cfc2996360a860750;hp=285841e4d8b93d3f4c475653a791194450171848;hpb=2d897a731bd23f7a33b89e7b7e3004b6b26b5a94;p=collectd.git diff --git a/src/cpu.c b/src/cpu.c index 285841e4..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 @@ -69,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; @@ -118,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", (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) @@ -162,12 +144,14 @@ 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); @@ -221,20 +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, "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 /* @@ -257,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; @@ -270,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; } @@ -278,7 +262,7 @@ 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 */ @@ -297,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); } @@ -337,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])); } } @@ -349,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++) { @@ -378,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: " @@ -397,14 +386,9 @@ static int cpu_read (void) 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 */