# 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;
{
#if PROCESSOR_CPU_LOAD_INFO || PROCESSOR_TEMPERATURE
kern_return_t status;
- int collectd_step;
port_host = mach_host_self ();
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)
if (sysctlbyname ("hw.ncpu", &numcpu, &numcpu_size, NULL, 0) < 0)
{
- WARNING ("cpu: sysctlbyname: %s", strerror (errno));
+ char errbuf[1024];
+ WARNING ("cpu plugin: sysctlbyname: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (-1);
}
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);
}
submit (cpu, "wait", wait);
submit (cpu, "interrupt", intr);
submit (cpu, "softirq", sitr);
+
+ if (numfields >= 9)
+ submit (cpu, "steal", atoll (fields[8]));
}
}
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: "
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 */