X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbattery.c;h=952c56c071f854e0c3fbbc3d12ba7866f2c420bc;hb=a095d4f8e3917cca8a989bf1d8f0a6979a3d9652;hp=eb1dab3f9a7d850d0b8bce1f2c89163bf1dfacc4;hpb=21d12b86c31c675b6affb4548dabe2f2d551ac5a;p=collectd.git diff --git a/src/battery.c b/src/battery.c index eb1dab3f..952c56c0 100644 --- a/src/battery.c +++ b/src/battery.c @@ -1,11 +1,10 @@ /** * collectd - src/battery.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,10 +22,6 @@ #include "collectd.h" #include "common.h" #include "plugin.h" -#include "utils_debug.h" - -#define MODULE_NAME "battery" -#define BUFSIZE 512 #if HAVE_MACH_MACH_TYPES_H # include @@ -61,31 +56,7 @@ #define INVALID_VALUE 47841.29 -static char *battery_current_file = "battery-%s/current.rrd"; -static char *battery_voltage_file = "battery-%s/voltage.rrd"; -static char *battery_charge_file = "battery-%s/charge.rrd"; - -static char *ds_def_current[] = -{ - "DS:current:GAUGE:"COLLECTD_HEARTBEAT":U:U", - NULL -}; -static int ds_num_current = 1; - -static char *ds_def_voltage[] = -{ - "DS:voltage:GAUGE:"COLLECTD_HEARTBEAT":U:U", - NULL -}; -static int ds_num_voltage = 1; - -static char *ds_def_charge[] = -{ - "DS:charge:GAUGE:"COLLECTD_HEARTBEAT":0:U", - NULL -}; -static int ds_num_charge = 1; - +#if BATTERY_HAVE_READ #if HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H /* No global variables */ /* #endif HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H */ @@ -95,7 +66,7 @@ static int battery_pmu_num = 0; static char *battery_pmu_file = "/proc/pmu/battery_%i"; #endif /* KERNEL_LINUX */ -static void battery_init (void) +static int battery_init (void) { #if HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H /* No init neccessary */ @@ -103,13 +74,13 @@ static void battery_init (void) #elif KERNEL_LINUX int len; - char filename[BUFSIZE]; + char filename[128]; for (battery_pmu_num = 0; ; battery_pmu_num++) { - len = snprintf (filename, BUFSIZE, battery_pmu_file, battery_pmu_num); + len = snprintf (filename, sizeof (filename), battery_pmu_file, battery_pmu_num); - if ((len >= BUFSIZE) || (len < 0)) + if ((len >= sizeof (filename)) || (len < 0)) break; if (access (filename, R_OK)) @@ -117,91 +88,27 @@ static void battery_init (void) } #endif /* KERNEL_LINUX */ - return; -} - -static void battery_current_write (char *host, char *inst, char *val) -{ - char filename[BUFSIZE]; - int len; - - len = snprintf (filename, BUFSIZE, battery_current_file, inst); - if ((len >= BUFSIZE) || (len < 0)) - return; - - rrd_update_file (host, filename, val, - ds_def_current, ds_num_current); -} - -static void battery_voltage_write (char *host, char *inst, char *val) -{ - char filename[BUFSIZE]; - int len; - - len = snprintf (filename, BUFSIZE, battery_voltage_file, inst); - if ((len >= BUFSIZE) || (len < 0)) - return; - - rrd_update_file (host, filename, val, - ds_def_voltage, ds_num_voltage); -} - -static void battery_charge_write (char *host, char *inst, char *val) -{ - char filename[BUFSIZE]; - int len; - - len = snprintf (filename, BUFSIZE, battery_charge_file, inst); - if ((len >= BUFSIZE) || (len < 0)) - return; - - rrd_update_file (host, filename, val, - ds_def_charge, ds_num_charge); + return (0); } -#if BATTERY_HAVE_READ -static void battery_submit (char *inst, double current, double voltage, double charge) +static void battery_submit (const char *plugin_instance, const char *type, double value) { - int len; - char buffer[BUFSIZE]; - - if (current != INVALID_VALUE) - { - len = snprintf (buffer, BUFSIZE, "N:%.3f", current); - - if ((len > 0) && (len < BUFSIZE)) - plugin_submit ("battery_current", inst, buffer); - } - else - { - plugin_submit ("battery_current", inst, "N:U"); - } + value_t values[1]; + value_list_t vl = VALUE_LIST_INIT; - if (voltage != INVALID_VALUE) - { - len = snprintf (buffer, BUFSIZE, "N:%.3f", voltage); - - if ((len > 0) && (len < BUFSIZE)) - plugin_submit ("battery_voltage", inst, buffer); - } - else - { - plugin_submit ("battery_voltage", inst, "N:U"); - } + values[0].gauge = value; - if (charge != INVALID_VALUE) - { - len = snprintf (buffer, BUFSIZE, "N:%.3f", charge); + vl.values = values; + vl.values_len = 1; + vl.time = time (NULL); + strcpy (vl.host, hostname_g); + strcpy (vl.plugin, "battery"); + strcpy (vl.plugin_instance, plugin_instance); - if ((len > 0) && (len < BUFSIZE)) - plugin_submit ("battery_charge", inst, buffer); - } - else - { - plugin_submit ("battery_charge", inst, "N:U"); - } -} + plugin_dispatch_values (type, &vl); +} /* void battery_submit */ +#if HAVE_IOKIT_PS_IOPOWERSOURCES_H || HAVE_IOKIT_IOKITLIB_H double dict_get_double (CFDictionaryRef dict, char *key_string) { double val_double; @@ -213,13 +120,13 @@ double dict_get_double (CFDictionaryRef dict, char *key_string) kCFStringEncodingASCII); if (key_obj == NULL) { - DBG ("CFStringCreateWithCString (%s) failed.\n", key_string); + DEBUG ("CFStringCreateWithCString (%s) failed.\n", key_string); return (INVALID_VALUE); } if ((val_obj = CFDictionaryGetValue (dict, key_obj)) == NULL) { - DBG ("CFDictionaryGetValue (%s) failed.\n", key_string); + DEBUG ("CFDictionaryGetValue (%s) failed.", key_string); CFRelease (key_obj); return (INVALID_VALUE); } @@ -243,12 +150,13 @@ double dict_get_double (CFDictionaryRef dict, char *key_string) } else { - DBG ("CFGetTypeID (val_obj) = %i\n", (int) CFGetTypeID (val_obj)); + DEBUG ("CFGetTypeID (val_obj) = %i", (int) CFGetTypeID (val_obj)); return (INVALID_VALUE); } return (val_double); } +#endif /* HAVE_IOKIT_PS_IOPOWERSOURCES_H || HAVE_IOKIT_IOKITLIB_H */ #if HAVE_IOKIT_PS_IOPOWERSOURCES_H static void get_via_io_power_sources (double *ret_charge, @@ -268,7 +176,7 @@ static void get_via_io_power_sources (double *ret_charge, ps_array = IOPSCopyPowerSourcesList (ps_raw); ps_array_len = CFArrayGetCount (ps_array); - DBG ("ps_array_len == %i", ps_array_len); + DEBUG ("ps_array_len == %i", ps_array_len); for (i = 0; i < ps_array_len; i++) { @@ -277,13 +185,13 @@ static void get_via_io_power_sources (double *ret_charge, if (ps_dict == NULL) { - DBG ("IOPSGetPowerSourceDescription failed."); + DEBUG ("IOPSGetPowerSourceDescription failed."); continue; } if (CFGetTypeID (ps_dict) != CFDictionaryGetTypeID ()) { - DBG ("IOPSGetPowerSourceDescription did not return a CFDictionaryRef"); + DEBUG ("IOPSGetPowerSourceDescription did not return a CFDictionaryRef"); continue; } @@ -291,19 +199,13 @@ static void get_via_io_power_sources (double *ret_charge, if (*ret_charge == INVALID_VALUE) { - double current_charge; - double total_charge; - - current_charge = dict_get_double (ps_dict, + /* This is the charge in percent. */ + temp_double = dict_get_double (ps_dict, kIOPSCurrentCapacityKey); - total_charge = dict_get_double (ps_dict, - kIOPSMaxCapacityKey); - - if ((current_charge != INVALID_VALUE) - && (total_charge != INVALID_VALUE) - && (current_charge >= 0.0) - && (current_charge <= 100.0)) - *ret_charge = total_charge * current_charge / 100.0; + if ((temp_double != INVALID_VALUE) + && (temp_double >= 0.0) + && (temp_double <= 100.0)) + *ret_charge = temp_double; } if (*ret_current == INVALID_VALUE) @@ -350,7 +252,7 @@ static void get_via_generic_iokit (double *ret_charge, &iterator); if (status != kIOReturnSuccess) { - DBG ("IOServiceGetMatchingServices failed."); + DEBUG ("IOServiceGetMatchingServices failed."); return; } @@ -362,7 +264,7 @@ static void get_via_generic_iokit (double *ret_charge, kNilOptions); if (status != kIOReturnSuccess) { - DBG ("IORegistryEntryCreateCFProperties failed."); + DEBUG ("IORegistryEntryCreateCFProperties failed."); continue; } @@ -381,6 +283,14 @@ static void get_via_generic_iokit (double *ret_charge, { bat_info_dict = (CFDictionaryRef) CFArrayGetValueAtIndex (bat_info_arry, bat_info_arry_pos); + if (*ret_charge == INVALID_VALUE) + { + temp_double = dict_get_double (bat_info_dict, + "Capacity"); + if (temp_double != INVALID_VALUE) + *ret_charge = temp_double / 1000.0; + } + if (*ret_current == INVALID_VALUE) { temp_double = dict_get_double (bat_info_dict, @@ -405,34 +315,38 @@ static void get_via_generic_iokit (double *ret_charge, } #endif /* HAVE_IOKIT_IOKITLIB_H */ -static void battery_read (void) +static int battery_read (void) { #if HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H - double charge = INVALID_VALUE; - double current = INVALID_VALUE; - double voltage = INVALID_VALUE; + double charge = INVALID_VALUE; /* Current charge in Ah */ + double current = INVALID_VALUE; /* Current in A */ + double voltage = INVALID_VALUE; /* Voltage in V */ + + double charge_rel = INVALID_VALUE; /* Current charge in percent */ + double charge_abs = INVALID_VALUE; /* Total capacity */ #if HAVE_IOKIT_PS_IOPOWERSOURCES_H - get_via_io_power_sources (&charge, ¤t, &voltage); + get_via_io_power_sources (&charge_rel, ¤t, &voltage); #endif - #if HAVE_IOKIT_IOKITLIB_H - if ((charge == INVALID_VALUE) - || (current == INVALID_VALUE) - || (voltage == INVALID_VALUE)) - get_via_generic_iokit (&charge, ¤t, &voltage); + get_via_generic_iokit (&charge_abs, ¤t, &voltage); #endif - if ((charge != INVALID_VALUE) - || (current != INVALID_VALUE) - || (voltage != INVALID_VALUE)) - battery_submit ("battery", current, voltage, charge); + if ((charge_rel != INVALID_VALUE) && (charge_abs != INVALID_VALUE)) + charge = charge_abs * charge_rel / 100.0; + + if (charge != INVALID_VALUE) + battery_submit ("0", "charge", charge); + if (current != INVALID_VALUE) + battery_submit ("0", "current", current); + if (voltage != INVALID_VALUE) + battery_submit ("0", "voltage", voltage); /* #endif HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H */ #elif KERNEL_LINUX FILE *fh; - char buffer[BUFSIZE]; - char filename[BUFSIZE]; + char buffer[1024]; + char filename[256]; char *fields[8]; int numfields; @@ -442,24 +356,24 @@ static void battery_read (void) for (i = 0; i < battery_pmu_num; i++) { - char batnum_str[BUFSIZE]; + char batnum_str[256]; double current = INVALID_VALUE; double voltage = INVALID_VALUE; double charge = INVALID_VALUE; double *valptr = NULL; - len = snprintf (filename, BUFSIZE, battery_pmu_file, i); - if ((len >= BUFSIZE) || (len < 0)) + len = snprintf (filename, sizeof (filename), battery_pmu_file, i); + if ((len >= sizeof (filename)) || (len < 0)) continue; - len = snprintf (batnum_str, BUFSIZE, "%i", i); - if ((len >= BUFSIZE) || (len < 0)) + len = snprintf (batnum_str, sizeof (batnum_str), "%i", i); + if ((len >= sizeof (batnum_str)) || (len < 0)) continue; if ((fh = fopen (filename, "r")) == NULL) continue; - while (fgets (buffer, BUFSIZE, fh) != NULL) + while (fgets (buffer, sizeof (buffer), fh) != NULL) { numfields = strsplit (buffer, fields, 8); @@ -489,13 +403,15 @@ static void battery_read (void) } } - if ((current != INVALID_VALUE) - || (voltage != INVALID_VALUE) - || (charge != INVALID_VALUE)) - battery_submit (batnum_str, current, voltage, charge); - fclose (fh); fh = NULL; + + if (charge != INVALID_VALUE) + battery_submit ("0", "charge", charge); + if (current != INVALID_VALUE) + battery_submit ("0", "current", current); + if (voltage != INVALID_VALUE) + battery_submit ("0", "voltage", voltage); } if (access ("/proc/acpi/battery", R_OK | X_OK) == 0) @@ -511,8 +427,10 @@ static void battery_read (void) if ((dh = opendir ("/proc/acpi/battery")) == NULL) { - syslog (LOG_ERR, "Cannot open `/proc/acpi/battery': %s", strerror (errno)); - return; + char errbuf[1024]; + ERROR ("Cannot open `/proc/acpi/battery': %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + return (-1); } while ((ent = readdir (dh)) != NULL) @@ -520,13 +438,18 @@ static void battery_read (void) if (ent->d_name[0] == '.') continue; - len = snprintf (filename, BUFSIZE, "/proc/acpi/battery/%s/state", ent->d_name); - if ((len >= BUFSIZE) || (len < 0)) + len = snprintf (filename, sizeof (filename), + "/proc/acpi/battery/%s/state", + ent->d_name); + if ((len >= sizeof (filename)) || (len < 0)) continue; if ((fh = fopen (filename, "r")) == NULL) { - syslog (LOG_ERR, "Cannot open `%s': %s", filename, strerror (errno)); + char errbuf[1024]; + ERROR ("Cannot open `%s': %s", filename, + sstrerror (errno, errbuf, + sizeof (errbuf))); continue; } @@ -539,7 +462,7 @@ static void battery_read (void) * [11:00] <@tokkee> remaining capacity: 4136 mAh * [11:00] <@tokkee> present voltage: 12428 mV */ - while (fgets (buffer, BUFSIZE, fh) != NULL) + while (fgets (buffer, sizeof (buffer), fh) != NULL) { numfields = strsplit (buffer, fields, 8); @@ -579,34 +502,33 @@ static void battery_read (void) if ((fields[2] == endptr) || (errno != 0)) *valptr = INVALID_VALUE; } - } + } /* while (fgets (buffer, sizeof (buffer), fh) != NULL) */ + + fclose (fh); if ((current != INVALID_VALUE) && (charging == 0)) current *= -1; - if ((current != INVALID_VALUE) - || (voltage != INVALID_VALUE) - || (charge != INVALID_VALUE)) - battery_submit (ent->d_name, current, voltage, charge); - - fclose (fh); + if (charge != INVALID_VALUE) + battery_submit ("0", "charge", charge); + if (current != INVALID_VALUE) + battery_submit ("0", "current", current); + if (voltage != INVALID_VALUE) + battery_submit ("0", "voltage", voltage); } closedir (dh); } #endif /* KERNEL_LINUX */ + + return (0); } -#else -# define battery_read NULL #endif /* BATTERY_HAVE_READ */ void module_register (void) { - plugin_register (MODULE_NAME, battery_init, battery_read, NULL); - plugin_register ("battery_current", NULL, NULL, battery_current_write); - plugin_register ("battery_voltage", NULL, NULL, battery_voltage_write); - plugin_register ("battery_charge", NULL, NULL, battery_charge_write); -} - -#undef BUFSIZE -#undef MODULE_NAME +#if BATTERY_HAVE_READ + plugin_register_init ("battery", battery_init); + plugin_register_read ("battery", battery_read); +#endif /* BATTERY_HAVE_READ */ +} /* void module_register */