diff --git a/src/cpu.c b/src/cpu.c
index d774ca4e764eaf1b2412c22eb77a8e999a7d6384..ba0c1b1a2880db85195a77b6bf67c7a82edc5dc6 100644 (file)
--- a/src/cpu.c
+++ b/src/cpu.c
# endif
#endif /* HAVE_SYSCTLBYNAME */
# 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
#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;
#ifdef PROCESSOR_CPU_LOAD_INFO
static mach_port_t port_host;
static processor_port_array_t cpu_list;
}
submit (cpu, "user", (counter_t) cpu_info.cpu_ticks[CPU_STATE_USER]);
}
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
/*
#endif /* PROCESSOR_CPU_LOAD_INFO */
#if PROCESSOR_TEMPERATURE
/*
static cpu_stat_t cs;
if (kc == NULL)
static cpu_stat_t cs;
if (kc == NULL)
- return;
+ return (-1);
for (cpu = 0; cpu < numcpu; cpu++)
{
for (cpu = 0; cpu < numcpu; cpu++)
{
return (0);
}
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 */
} /* void module_register */