X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapple_sensors.c;h=d312027670a2b34c68bd2974d90095a93201b168;hb=fd9c88963b04c9e9050a952ba0f018493e8b7638;hp=24e8f977cdd8454c81fc704185fb35400746ec1a;hpb=4ff510ffa41e47f31c695c83f045fd79efecf5f4;p=collectd.git diff --git a/src/apple_sensors.c b/src/apple_sensors.c index 24e8f977..d3120276 100644 --- a/src/apple_sensors.c +++ b/src/apple_sensors.c @@ -1,11 +1,10 @@ /** * collectd - src/apple_sensors.c - * Copyright (C) 2006 Florian octo Forster + * Copyright (C) 2006,2007 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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Free Software Foundation; only version 2 of the License is applicable. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,9 +22,6 @@ #include "collectd.h" #include "common.h" #include "plugin.h" -#include "utils_debug.h" - -#define MODULE_NAME "apple_sensors" #if HAVE_CTYPE_H # include @@ -53,29 +49,10 @@ # include #endif -#if HAVE_IOKIT_IOKITLIB_H -# define IOKIT_HAVE_READ 1 -#else -# define IOKIT_HAVE_READ 0 -#endif - -#if HAVE_IOKIT_IOKITLIB_H static mach_port_t io_master_port = MACH_PORT_NULL; -#endif - -static char *temperature_file = "apple_sensors/temperature-%s.rrd"; -static char *fanspeed_file = "apple_sensors/fanspeed-%s.rrd"; -static char *ds_def[] = +static int as_init (void) { - "DS:value:GAUGE:"COLLECTD_HEARTBEAT":U:U", - NULL -}; -static int ds_num = 1; - -static void as_init (void) -{ -#if IOKIT_HAVE_READ kern_return_t status; if (io_master_port != MACH_PORT_NULL) @@ -88,51 +65,39 @@ static void as_init (void) status = IOMasterPort (MACH_PORT_NULL, &io_master_port); if (status != kIOReturnSuccess) { - syslog (LOG_ERR, "IOMasterPort failed: %s", + ERROR ("IOMasterPort failed: %s", mach_error_string (status)); io_master_port = MACH_PORT_NULL; - return; + return (-1); } -#endif /* IOKIT_HAVE_READ */ - - return; -} - -static void as_write (char *host, char *inst, char *val, const char *template) -{ - char filename[256]; - int status; - status = snprintf (filename, 256, template, inst); - if ((status < 1) || (status >= 256)) - return; - - rrd_update_file (host, filename, val, ds_def, ds_num); + return (0); } -static void temperature_write (char *host, char *inst, char *val) +static void as_submit (const char *type, const char *type_instance, + double val) { - as_write (host, inst, val, temperature_file); -} + value_t values[1]; + value_list_t vl = VALUE_LIST_INIT; -static void fanspeed_write (char *host, char *inst, char *val) -{ - as_write (host, inst, val, fanspeed_file); -} + DEBUG ("type = %s; type_instance = %s; val = %f;", + type, type_instance, val); -#if IOKIT_HAVE_READ -static void as_submit (char *type, char *inst, double value) -{ - char buf[128]; + values[0].gauge = val; - if (snprintf (buf, 1024, "%u:%f", (unsigned int) curtime, - value) >= 128) - return; + vl.values = values; + vl.values_len = 1; + vl.time = time (NULL); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "apple_sensors", sizeof (vl.plugin)); + sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance)); + sstrncpy (vl.type, type, sizeof (vl.type)); + sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); - plugin_submit (type, inst, buf); + plugin_dispatch_values (&vl); } -static void as_read (void) +static int as_read (void) { kern_return_t status; io_iterator_t iterator; @@ -147,16 +112,16 @@ static void as_read (void) int i; if (!io_master_port || (io_master_port == MACH_PORT_NULL)) - return; + return (-1); status = IOServiceGetMatchingServices (io_master_port, IOServiceNameMatching("IOHWSensor"), &iterator); if (status != kIOReturnSuccess) { - syslog (LOG_ERR, "IOServiceGetMatchingServices failed: %s", + ERROR ("IOServiceGetMatchingServices failed: %s", mach_error_string (status)); - return; + return (-1); } while ((io_obj = IOIteratorNext (iterator))) @@ -168,7 +133,7 @@ static void as_read (void) kNilOptions); if (status != kIOReturnSuccess) { - DBG ("IORegistryEntryCreateCFProperties failed: %s", + DEBUG ("IORegistryEntryCreateCFProperties failed: %s", mach_error_string (status)); continue; } @@ -182,10 +147,10 @@ static void as_read (void) if (CFGetTypeID (property) != CFStringGetTypeID ()) continue; if (!CFStringGetCString (property, - type, 128, + type, sizeof (type), kCFStringEncodingASCII)) continue; - type[127] = '\0'; + type[sizeof (type) - 1] = '\0'; /* Copy the sensor location. This will be used as `instance'. */ property = NULL; @@ -196,10 +161,10 @@ static void as_read (void) if (CFGetTypeID (property) != CFStringGetTypeID ()) continue; if (!CFStringGetCString (property, - inst, 128, + inst, sizeof (inst), kCFStringEncodingASCII)) continue; - inst[127] = '\0'; + inst[sizeof (inst) - 1] = '\0'; for (i = 0; i < 128; i++) { if (inst[i] == '\0') @@ -224,24 +189,35 @@ static void as_read (void) &value_int)) continue; + /* Found e.g. in the 1.5GHz PowerBooks */ if (strcmp (type, "temperature") == 0) { value_double = ((double) value_int) / 65536.0; - strncpy (type, "apple_temperature", 128); + sstrncpy (type, "temperature", sizeof (type)); + } + else if (strcmp (type, "temp") == 0) + { + value_double = ((double) value_int) / 10.0; + sstrncpy (type, "temperature", sizeof (type)); } else if (strcmp (type, "fanspeed") == 0) { value_double = ((double) value_int) / 65536.0; - strncpy (type, "apple_fanspeed", 128); + sstrncpy (type, "fanspeed", sizeof (type)); } else if (strcmp (type, "voltage") == 0) { /* Leave this to the battery plugin. */ continue; } + else if (strcmp (type, "adc") == 0) + { + value_double = ((double) value_int) / 10.0; + sstrncpy (type, "fanspeed", sizeof (type)); + } else { - DBG ("apple_sensors: Read unknown sensor type: %s", + DEBUG ("apple_sensors: Read unknown sensor type: %s", type); value_double = (double) value_int; } @@ -253,16 +229,12 @@ static void as_read (void) } /* while (iterator) */ IOObjectRelease (iterator); -} -#else -# define as_read NULL -#endif /* IOKIT_HAVE_READ */ + + return (0); +} /* int as_read */ void module_register (void) { - plugin_register (MODULE_NAME, as_init, as_read, NULL); - plugin_register ("apple_temperature", NULL, NULL, temperature_write); - plugin_register ("apple_fanspeed", NULL, NULL, fanspeed_write); -} - -#undef MODULE_NAME + plugin_register_init ("apple_sensors", as_init); + plugin_register_read ("apple_sensors", as_read); +} /* void module_register */