solaris-fixes branch: Applied the swap-patch by Christophe Kalt.
[collectd.git] / src / cpu.c
index 6832b52..ca78294 100644 (file)
--- 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
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
+#include "utils_debug.h"
 
 #define MODULE_NAME "cpu"
 
-#if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) || defined(HAVE_SYSCTLBYNAME)
-# define CPU_HAVE_READ 1
-#else
-# define CPU_HAVE_READ 0
+#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
+#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
 # 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;
+
+#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 */
 
@@ -71,18 +110,41 @@ 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;
 
-void cpu_init (void)
+static void cpu_init (void)
 {
-#ifdef HAVE_LIBKSTAT
+#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)
+       {
+               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");
+
+       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)
        kstat_t *ksp_chain;
 
        numcpu = 0;
@@ -116,7 +178,7 @@ void cpu_init (void)
        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;
@@ -130,6 +192,7 @@ 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 +210,99 @@ 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
+#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;
+       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++)
+       {
+#if PROCESSOR_CPU_LOAD_INFO
+               cpu_host = 0;
+               cpu_info_len = PROCESSOR_BASIC_INFO_COUNT;
+
+               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, "cpu-plugin: processor_info failed with status %i\n", (int) status);
+                       continue;
+               }
+
+               if (cpu_info_len < CPU_STATE_MAX)
+               {
+                       syslog (LOG_ERR, "cpu-plugin: 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 */
+#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 */
+
+#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 */
@@ -249,17 +400,13 @@ static void cpu_read (void)
 
        return;
 }
+#else
+# define cpu_read NULL
 #endif /* CPU_HAVE_READ */
 
 void module_register (void)
 {
-       plugin_register (MODULE_NAME, cpu_init,
-#if CPU_HAVE_READ
-                       cpu_read,
-#else
-                       NULL,
-#endif
-                       cpu_write);
+       plugin_register (MODULE_NAME, cpu_init, cpu_read, cpu_write);
 }
 
 #undef MODULE_NAME