X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcpu.c;h=ad0816d86c889ba9c1c6fd9463cc0c277e08b7a0;hb=5ad4d81af38cc11bdaaf87270bce2d8f90494fd5;hp=5252324ad910a58899cf9d8492b8a88dee32946b;hpb=9ac8dcf06e686456ed893acedf5f0ba68e3e3c97;p=collectd.git

diff --git a/src/cpu.c b/src/cpu.c
index 5252324a..ad0816d8 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -23,9 +23,26 @@
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
+#include "utils_debug.h"
 
 #define MODULE_NAME "cpu"
 
+#ifdef HAVE_MACH_KERN_RETURN_H
+# include <mach/kern_return.h>
+#endif
+#ifdef HAVE_MACH_MACH_INIT_H
+# include <mach/mach_init.h>
+#endif
+#ifdef HAVE_MACH_HOST_PRIV_H
+# include <mach/host_priv.h>
+#endif
+#ifdef HAVE_MACH_PROCESSOR_INFO_H
+# include <mach/processor_info.h>
+#endif
+#ifdef HAVE_MACH_PROCESSOR_H
+# include <mach/processor.h>
+#endif
+
 #ifdef HAVE_LIBKSTAT
 # include <sys/sysinfo.h>
 #endif /* HAVE_LIBKSTAT */
@@ -39,12 +56,6 @@
 #  include <sys/dkstat.h>
 # endif
 
-#if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) || defined(HAVE_SYSCTLBYNAME)
-# define CPU_HAVE_READ 1
-#else
-# define CPU_HAVE_READ 0
-#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
@@ -55,15 +66,31 @@
 # endif
 #endif /* HAVE_SYSCTLBYNAME */
 
-#ifdef HAVE_LIBKSTAT
+#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
+#endif
+
+#ifdef PROCESSOR_CPU_LOAD_INFO
+static mach_port_t port_host;
+static processor_port_array_t cpu_list;
+static mach_msg_type_number_t cpu_list_len;
+/* #endif PROCESSOR_CPU_LOAD_INFO */
+
+#elif defined(KERNEL_LINUX)
+/* no variables needed */
+/* #endif KERNEL_LINUX */
+
+#elif defined(HAVE_LIBKSTAT)
 /* colleague tells me that Sun doesn't sell systems with more than 100 or so CPUs.. */
 # define MAX_NUMCPU 256
 extern kstat_ctl_t *kc;
 static kstat_t *ksp[MAX_NUMCPU];
 static int numcpu;
-#endif /* HAVE_LIBKSTAT */
+/* #endif HAVE_LIBKSTAT */
 
-#ifdef HAVE_SYSCTLBYNAME
+#elif defined(HAVE_SYSCTLBYNAME)
 static int numcpu;
 #endif /* HAVE_SYSCTLBYNAME */
 
@@ -71,18 +98,35 @@ static char *cpu_filename = "cpu-%s.rrd";
 
 static char *ds_def[] =
 {
-	"DS:user:COUNTER:25:0:100",
-	"DS:nice:COUNTER:25:0:100",
-	"DS:syst:COUNTER:25:0:100",
-	"DS:idle:COUNTER:25:0:100",
-	"DS:wait:COUNTER:25:0:100",
+	"DS:user:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+	"DS:nice:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+	"DS:syst:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+	"DS:idle:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+	"DS:wait:COUNTER:"COLLECTD_HEARTBEAT":0:U",
 	NULL
 };
 static int ds_num = 5;
 
 static void cpu_init (void)
 {
-#ifdef HAVE_LIBKSTAT
+#ifdef PROCESSOR_CPU_LOAD_INFO
+	kern_return_t status;
+
+	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\n", (int) status);
+		cpu_list_len = 0;
+		return;
+	}
+
+	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");
+/* #endif PROCESSOR_CPU_LOAD_INFO */
+
+#elif defined(HAVE_LIBKSTAT)
 	kstat_t *ksp_chain;
 
 	numcpu = 0;
@@ -130,6 +174,7 @@ static void cpu_write (char *host, char *inst, char *val)
 	rrd_update_file (host, file, val, ds_def, ds_num);
 }
 
+#if CPU_HAVE_READ
 #define BUFSIZE 512
 static void cpu_submit (int cpu_num, unsigned long long user,
 		unsigned long long nice, unsigned long long syst,
@@ -147,11 +192,47 @@ static void cpu_submit (int cpu_num, unsigned long long user,
 }
 #undef BUFSIZE
 
-#if CPU_HAVE_READ
 static void cpu_read (void)
 {
-#ifdef KERNEL_LINUX
-#define BUFSIZE 1024
+#ifdef PROCESSOR_CPU_LOAD_INFO
+	int cpu;
+
+	kern_return_t status;
+	
+	processor_cpu_load_info_data_t cpu_info;
+	mach_msg_type_number_t         cpu_info_len;
+
+	host_t cpu_host;
+
+	for (cpu = 0; cpu < cpu_list_len; cpu++)
+	{
+		cpu_host = 0;
+		cpu_info_len = sizeof (cpu_info);
+
+		if ((status = processor_info (cpu_list[cpu],
+						PROCESSOR_CPU_LOAD_INFO, &cpu_host,
+						(processor_info_t) &cpu_info, &cpu_info_len)) != KERN_SUCCESS)
+		{
+			syslog (LOG_ERR, "processor_info failed with status %i\n", (int) status);
+			continue;
+		}
+
+		if (cpu_info_len < CPU_STATE_MAX)
+		{
+			syslog (LOG_ERR, "processor_info returned only %i elements..\n", cpu_info_len);
+			continue;
+		}
+
+		cpu_submit (cpu, cpu_info.cpu_ticks[CPU_STATE_USER],
+				cpu_info.cpu_ticks[CPU_STATE_NICE],
+				cpu_info.cpu_ticks[CPU_STATE_SYSTEM],
+				cpu_info.cpu_ticks[CPU_STATE_IDLE],
+				0ULL);
+	}
+/* #endif PROCESSOR_CPU_LOAD_INFO */
+
+#elif defined(KERNEL_LINUX)
+# define BUFSIZE 1024
 	int cpu;
 	unsigned long long user, nice, syst, idle;
 	unsigned long long wait, intr, sitr; /* sitr == soft interrupt */