X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcpu.c;h=b087d6654d2edfa84480fd5e6d5dffec80aa5392;hb=4c66592ee43abb01bfc792dac9bcc0df9d3df567;hp=1a4c62edd0afe8aca78477eb5c468de02067449b;hpb=daf3a589d4f4c47dabaf6f7f4a33fd7bb4140183;p=collectd.git

diff --git a/src/cpu.c b/src/cpu.c
index 1a4c62ed..b087d665 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/cpu.c
- * Copyright (C) 2005  Florian octo Forster
+ * Copyright (C) 2005,2006  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -23,6 +23,7 @@
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
+#include "utils_debug.h"
 
 #define MODULE_NAME "cpu"
 
@@ -35,12 +36,18 @@
 #ifdef HAVE_MACH_HOST_PRIV_H
 # include <mach/host_priv.h>
 #endif
+#if HAVE_MACH_MACH_ERROR_H
+#  include <mach/mach_error.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_MACH_VM_MAP_H
+# include <mach/vm_map.h>
+#endif
 
 #ifdef HAVE_LIBKSTAT
 # include <sys/sysinfo.h>
@@ -75,17 +82,27 @@
 static mach_port_t port_host;
 static processor_port_array_t cpu_list;
 static mach_msg_type_number_t cpu_list_len;
-#endif
 
-#ifdef HAVE_LIBKSTAT
+#if PROCESSOR_TEMPERATURE
+static int cpu_temp_retry_counter = 0;
+static int cpu_temp_retry_step    = 1;
+static int cpu_temp_retry_max     = 1;
+#endif /* PROCESSOR_TEMPERATURE */
+/* #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 */
 
@@ -104,18 +121,27 @@ static int ds_num = 5;
 
 static void cpu_init (void)
 {
-#ifdef PROCESSOR_CPU_LOAD_INFO
+#if PROCESSOR_CPU_LOAD_INFO || PROCESSOR_TEMPERATURE
+	kern_return_t status;
+	int collectd_step;
+
 	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)
 	{
-		fprintf (stderr, "host_processors returned %i\n", (int) status);
+		syslog (LOG_ERR, "cpu-plugin: host_processors returned %i\n", (int) status);
 		cpu_list_len = 0;
-		return (-1);
+		return;
 	}
 
-	DBG ("host_processors returned %i %s", (int) list_len, list_len == 1 ? "processor" : "processors");
-	syslog (LOG_INFO, "Plugin `cpu' found %i processor%s.", (int) cpu_list_len, cpu_list_len == 1 ? "" : "s");
+	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");
+
+	collectd_step = atoi (COLLECTD_STEP);
+	if ((collectd_step > 0) && (collectd_step <= 86400))
+		cpu_temp_retry_max = 86400 / collectd_step;
+		
 /* #endif PROCESSOR_CPU_LOAD_INFO */
 
 #elif defined(HAVE_LIBKSTAT)
@@ -186,42 +212,92 @@ static void cpu_submit (int cpu_num, unsigned long long user,
 
 static void cpu_read (void)
 {
-#ifdef PROCESSOR_CPU_LOAD_INFO
+#if PROCESSOR_CPU_LOAD_INFO || PROCESSOR_TEMPERATURE
 	int cpu;
 
 	kern_return_t status;
 	
+#if PROCESSOR_CPU_LOAD_INFO
 	processor_cpu_load_info_data_t cpu_info;
-	processor_cpu_load_info_t      cpu_info_ptr;
 	mach_msg_type_number_t         cpu_info_len;
+#endif
+#if PROCESSOR_TEMPERATURE
+	processor_info_data_t          cpu_temp;
+	mach_msg_type_number_t         cpu_temp_len;
+#endif
 
 	host_t cpu_host;
 
 	for (cpu = 0; cpu < cpu_list_len; cpu++)
 	{
-		cpu_host = 0
-		cpu_info_ptr = &cpu_info;
-		cpu_info_len = sizeof (cpu_info);
+#if PROCESSOR_CPU_LOAD_INFO
+		cpu_host = 0;
+		cpu_info_len = PROCESSOR_BASIC_INFO_COUNT;
 
-		if ((status = processor_info (list[i],
+		if ((status = processor_info (cpu_list[cpu],
 						PROCESSOR_CPU_LOAD_INFO, &cpu_host,
-						(processor_info_t) cpu_info_ptr, &cpu_info_len)) != KERN_SUCCESS)
+						(processor_info_t) &cpu_info, &cpu_info_len)) != KERN_SUCCESS)
 		{
-			syslog (LOG_ERR, "processor_info failed with status %i\n", (int) status);
+			syslog (LOG_ERR, "cpu-plugin: 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);
+			syslog (LOG_ERR, "cpu-plugin: processor_info returned only %i elements..\n", cpu_info_len);
 			continue;
 		}
 
-		cpu_submit (i, cpu_info.cpu_ticks[CPU_STATE_USER],
+		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 */
+#if PROCESSOR_TEMPERATURE
+		/*
+		 * Not all Apple computers do have this ability. To minimize
+		 * the messages sent to the syslog we do an exponential
+		 * stepback if `processor_info' fails. We still try ~once a day
+		 * though..
+		 */
+		if (cpu_temp_retry_counter > 0)
+		{
+			cpu_temp_retry_counter--;
+			continue;
+		}
+
+		cpu_temp_len = PROCESSOR_INFO_MAX;
+
+		status = processor_info (cpu_list[cpu],
+				PROCESSOR_TEMPERATURE,
+				&cpu_host,
+				cpu_temp, &cpu_temp_len);
+		if (status != KERN_SUCCESS)
+		{
+			syslog (LOG_ERR, "cpu-plugin: processor_info failed: %s",
+					mach_error_string (status));
+
+			cpu_temp_retry_counter = cpu_temp_retry_step;
+			cpu_temp_retry_step *= 2;
+			if (cpu_temp_retry_step > cpu_temp_retry_max)
+				cpu_temp_retry_step = cpu_temp_retry_max;
+
+			continue;
+		}
+
+		if (cpu_temp_len != 1)
+		{
+			DBG ("processor_info (PROCESSOR_TEMPERATURE) returned %i elements..?",
+				       	(int) cpu_temp_len);
+			continue;
+		}
+
+		cpu_temp_retry_counter = 0;
+		cpu_temp_retry_step    = 1;
+
+		DBG ("cpu_temp = %i", (int) cpu_temp);
+#endif /* PROCESSOR_TEMPERATURE */
 	}
 /* #endif PROCESSOR_CPU_LOAD_INFO */
 
@@ -236,12 +312,19 @@ static void cpu_read (void)
 	char *fields[9];
 	int numfields;
 
+	static complain_t complain_obj;
+
 	if ((fh = fopen ("/proc/stat", "r")) == NULL)
 	{
-		syslog (LOG_WARNING, "cpu: fopen: %s", strerror (errno));
+		plugin_complain (LOG_ERR, &complain_obj, "cpu plugin: "
+				"fopen (/proc/stat) failed: %s",
+				strerror (errno));
 		return;
 	}
 
+	plugin_relief (LOG_NOTICE, &complain_obj, "cpu plugin: "
+			"fopen (/proc/stat) succeeded.");
+
 	while (fgets (buf, BUFSIZE, fh) != NULL)
 	{
 		if (strncmp (buf, "cpu", 3))
@@ -308,14 +391,21 @@ static void cpu_read (void)
 	long cpuinfo[CPUSTATES];
 	size_t cpuinfo_size;
 
+	static complain_t complain_obj;
+
 	cpuinfo_size = sizeof (cpuinfo);
 
 	if (sysctlbyname("kern.cp_time", &cpuinfo, &cpuinfo_size, NULL, 0) < 0)
 	{
-		syslog (LOG_WARNING, "cpu: sysctlbyname: %s", strerror (errno));
+		plugin_complain (LOG_ERR, &complain_obj, "cpu plugin: "
+				"sysctlbyname failed: %s.",
+				strerror (errno));
 		return;
 	}
 
+	plugin_relief (LOG_NOTICE, &complain_obj, "cpu plugin: "
+			"sysctlbyname succeeded.");
+
 	cpuinfo[CP_SYS] += cpuinfo[CP_INTR];
 
 	/* FIXME: Instance is always `0' */