# 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)
}
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
/*
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: "
}
#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);
- }
+ plugin_register_init ("cpu", init);
+ plugin_register_read ("cpu", cpu_read);
#endif /* CPU_HAVE_READ */
} /* void module_register */