diff --git a/src/cpu.c b/src/cpu.c
index 7a9700aee9424d7042be88f4d32c5a1bec66b05d..62e814578cb688d50bb5a857a34899f65bc520c2 100644 (file)
--- a/src/cpu.c
+++ b/src/cpu.c
* Florian octo Forster <octo at verplant.org>
**/
-#include "cpu.h"
+#include "collectd.h"
+#include "common.h"
+#include "plugin.h"
-#if COLLECT_CPU
#define MODULE_NAME "cpu"
#ifdef HAVE_LIBKSTAT
-#include <sys/sysinfo.h>
+# include <sys/sysinfo.h>
#endif /* HAVE_LIBKSTAT */
#ifdef HAVE_SYSCTLBYNAME
-#ifdef HAVE_SYS_SYSCTL_H
-#include <sys/sysctl.h>
-#endif
-
-#ifdef HAVE_SYS_DKSTAT_H
-#include <sys/dkstat.h>
-#endif
-
-#if !defined(CP_USER) || !defined(CP_NICE) || !defined(CP_SYS) || !defined(CP_INTR) || !defined(CP_IDLE) || !defined(CPUSTATES)
-#define CP_USER 0
-#define CP_NICE 1
-#define CP_SYS 2
-#define CP_INTR 3
-#define CP_IDLE 4
-#define CPUSTATES 5
-#endif
+# ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+# endif
+
+# ifdef HAVE_SYS_DKSTAT_H
+# include <sys/dkstat.h>
+# endif
+
+# if !defined(CP_USER) || !defined(CP_NICE) || !defined(CP_SYS) || !defined(CP_INTR) || !defined(CP_IDLE) || !defined(CPUSTATES)
+# define CP_USER 0
+# define CP_NICE 1
+# define CP_SYS 2
+# define CP_INTR 3
+# define CP_IDLE 4
+# define CPUSTATES 5
+# endif
#endif /* HAVE_SYSCTLBYNAME */
-#include "plugin.h"
-#include "common.h"
+#if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) || defined(HAVE_SYSCTLBYNAME)
+# define CPU_HAVE_READ 1
+#else
+# define CPU_HAVE_READ 0
+#endif
#ifdef HAVE_LIBKSTAT
/* colleague tells me that Sun doesn't sell systems with more than 100 or so CPUs.. */
-#define MAX_NUMCPU 256
+# define MAX_NUMCPU 256
extern kstat_ctl_t *kc;
static kstat_t *ksp[MAX_NUMCPU];
static int numcpu;
};
static int ds_num = 5;
-void cpu_init (void)
+static void cpu_init (void)
{
#ifdef HAVE_LIBKSTAT
kstat_t *ksp_chain;
return;
}
-void cpu_write (char *host, char *inst, char *val)
+static void cpu_write (char *host, char *inst, char *val)
{
char file[512];
int status;
rrd_update_file (host, file, val, ds_def, ds_num);
}
+#if CPU_HAVE_READ
#define BUFSIZE 512
-void cpu_submit (int cpu_num, unsigned long long user, unsigned long long nice, unsigned long long syst,
+static void cpu_submit (int cpu_num, unsigned long long user,
+ unsigned long long nice, unsigned long long syst,
unsigned long long idle, unsigned long long wait)
{
char buf[BUFSIZE];
}
#undef BUFSIZE
-void cpu_read (void)
+static void cpu_read (void)
{
#ifdef KERNEL_LINUX
#define BUFSIZE 1024
}
/* #endif defined(HAVE_LIBKSTAT) */
-#elif defined (HAVE_SYSCTLBYNAME)
+#elif defined(HAVE_SYSCTLBYNAME)
long cpuinfo[CPUSTATES];
size_t cpuinfo_size;
/* FIXME: Instance is always `0' */
cpu_submit (0, cpuinfo[CP_USER], cpuinfo[CP_NICE], cpuinfo[CP_SYS], cpuinfo[CP_IDLE], 0LL);
#endif
+
+ return;
}
+#else
+# define cpu_read NULL
+#endif /* CPU_HAVE_READ */
void module_register (void)
{
}
#undef MODULE_NAME
-#endif /* COLLECT_CPU */