/**
* 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
#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 <mach/mach_types.h>
# include <IOKit/ps/IOPSKeys.h>
#endif
-#if HAVE_IOKIT_PS_IOPOWERSOURCES_H || KERNEL_LINUX
-# define BATTERY_HAVE_READ 1
-#else
-# define BATTERY_HAVE_READ 0
+#if !HAVE_IOKIT_IOKITLIB_H && !HAVE_IOKIT_PS_IOPOWERSOURCES_H && !KERNEL_LINUX
+# error "No applicable input method."
#endif
#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 HAVE_IOKIT_PS_IOPOWERSOURCES_H
+#if HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H
/* No global variables */
-/* #endif HAVE_IOKIT_PS_IOPOWERSOURCES_H */
+/* #endif HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H */
#elif KERNEL_LINUX
static int battery_pmu_num = 0;
static char *battery_pmu_file = "/proc/pmu/battery_%i";
+static const char *battery_acpi_dir = "/proc/acpi/battery";
#endif /* KERNEL_LINUX */
-static void battery_init (void)
+static int battery_init (void)
{
-#if HAVE_IOKIT_PS_IOPOWERSOURCES_H
+#if HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H
/* No init neccessary */
-/* #endif HAVE_IOKIT_PS_IOPOWERSOURCES_H */
+/* #endif HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H */
#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 = ssnprintf (filename, sizeof (filename), battery_pmu_file, battery_pmu_num);
- if ((len >= BUFSIZE) || (len < 0))
+ if ((len < 0) || ((unsigned int)len >= sizeof (filename)))
break;
if (access (filename, R_OK))
}
#endif /* KERNEL_LINUX */
- return;
+ return (0);
}
-static void battery_current_write (char *host, char *inst, char *val)
+static void battery_submit (const char *plugin_instance, const char *type, double value)
{
- char filename[BUFSIZE];
- int len;
+ value_t values[1];
+ value_list_t vl = VALUE_LIST_INIT;
- len = snprintf (filename, BUFSIZE, battery_current_file, inst);
- if ((len >= BUFSIZE) || (len < 0))
- return;
+ values[0].gauge = value;
- 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;
+ vl.values = values;
+ vl.values_len = 1;
+ vl.time = time (NULL);
+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+ sstrncpy (vl.plugin, "battery", sizeof (vl.plugin));
+ sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
+ sstrncpy (vl.type, type, sizeof (vl.type));
- len = snprintf (filename, BUFSIZE, battery_voltage_file, inst);
- if ((len >= BUFSIZE) || (len < 0))
- return;
+ plugin_dispatch_values (&vl);
+} /* void battery_submit */
- rrd_update_file (host, filename, val,
- ds_def_voltage, ds_num_voltage);
-}
-
-static void battery_charge_write (char *host, char *inst, char *val)
+#if HAVE_IOKIT_PS_IOPOWERSOURCES_H || HAVE_IOKIT_IOKITLIB_H
+double dict_get_double (CFDictionaryRef dict, char *key_string)
{
- 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);
-}
-
-#if BATTERY_HAVE_READ
-static void battery_submit (char *inst, double current, double voltage, double charge)
-{
- int len;
- char buffer[BUFSIZE];
-
- if (current != INVALID_VALUE)
+ double val_double;
+ long long val_int;
+ CFNumberRef val_obj;
+ CFStringRef key_obj;
+
+ key_obj = CFStringCreateWithCString (kCFAllocatorDefault, key_string,
+ kCFStringEncodingASCII);
+ if (key_obj == NULL)
{
- len = snprintf (buffer, BUFSIZE, "N:%.3f", current);
-
- if ((len > 0) && (len < BUFSIZE))
- plugin_submit ("battery_current", inst, buffer);
+ DEBUG ("CFStringCreateWithCString (%s) failed.\n", key_string);
+ return (INVALID_VALUE);
}
- else
- {
- plugin_submit ("battery_current", inst, "N:U");
- }
-
- if (voltage != INVALID_VALUE)
- {
- len = snprintf (buffer, BUFSIZE, "N:%.3f", voltage);
- if ((len > 0) && (len < BUFSIZE))
- plugin_submit ("battery_voltage", inst, buffer);
- }
- else
+ if ((val_obj = CFDictionaryGetValue (dict, key_obj)) == NULL)
{
- plugin_submit ("battery_voltage", inst, "N:U");
+ DEBUG ("CFDictionaryGetValue (%s) failed.", key_string);
+ CFRelease (key_obj);
+ return (INVALID_VALUE);
}
+ CFRelease (key_obj);
- if (charge != INVALID_VALUE)
+ if (CFGetTypeID (val_obj) == CFNumberGetTypeID ())
{
- len = snprintf (buffer, BUFSIZE, "N:%.3f", charge);
-
- if ((len > 0) && (len < BUFSIZE))
- plugin_submit ("battery_charge", inst, buffer);
+ if (CFNumberIsFloatType (val_obj))
+ {
+ CFNumberGetValue (val_obj,
+ kCFNumberDoubleType,
+ &val_double);
+ }
+ else
+ {
+ CFNumberGetValue (val_obj,
+ kCFNumberLongLongType,
+ &val_int);
+ val_double = val_int;
+ }
}
else
{
- plugin_submit ("battery_charge", inst, "N:U");
+ 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 */
-static void battery_read (void)
-{
#if HAVE_IOKIT_PS_IOPOWERSOURCES_H
+static void get_via_io_power_sources (double *ret_charge,
+ double *ret_current,
+ double *ret_voltage)
+{
CFTypeRef ps_raw;
CFArrayRef ps_array;
int ps_array_len;
CFDictionaryRef ps_dict;
CFTypeRef ps_obj;
- CFTypeRef ps_value;
+ double temp_double;
int i;
- char name[128];
- double charge = INVALID_VALUE;
- double current = INVALID_VALUE;
- double voltage = INVALID_VALUE;
-
ps_raw = IOPSCopyPowerSourcesInfo ();
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++)
{
ps_obj = CFArrayGetValueAtIndex (ps_array, i);
ps_dict = IOPSGetPowerSourceDescription (ps_raw, ps_obj);
+ if (ps_dict == NULL)
+ {
+ DEBUG ("IOPSGetPowerSourceDescription failed.");
+ continue;
+ }
+
if (CFGetTypeID (ps_dict) != CFDictionaryGetTypeID ())
{
- DBG ("IOPSGetPowerSourceDescription did not return a CFDictionaryRef");
+ DEBUG ("IOPSGetPowerSourceDescription did not return a CFDictionaryRef");
continue;
}
- if (ps_dict != NULL)
+ /* FIXME: Check if this is really an internal battery */
+
+ if (*ret_charge == INVALID_VALUE)
{
- /* Get the current capacity/charge */
- ps_value = NULL;
- charge = INVALID_VALUE;
- if (CFDictionaryGetValueIfPresent (ps_dict,
- CFSTR (kIOPSCurrentCapacityKey),
- &ps_value))
- {
- if (CFGetTypeID (ps_value) != CFNumberGetTypeID ())
- CFNumberGetValue (ps_value,
- kCFNumberDoubleType,
- &charge);
- else
- DBG ("kIOPSCurrentCapacityKey: Not a CFNumber");
-
- DBG ("charge = %f", charge);
- }
- else
- DBG ("`%s' does not exist", kIOPSCurrentCapacityKey);
-
- /* Get the current */
- ps_value = NULL;
- current = INVALID_VALUE;
- if (CFDictionaryGetValueIfPresent (ps_dict,
- CFSTR (kIOPSCurrentKey),
- &ps_value))
- {
- if (CFGetTypeID (ps_value) != CFNumberGetTypeID ())
- CFNumberGetValue (ps_value,
- kCFNumberDoubleType,
- ¤t);
- else
- DBG ("kIOPSCurrentKey: Not a CFNumber");
- DBG ("current = %f", current);
- }
- else
- DBG ("`%s' does not exist", kIOPSCurrentKey);
-
- /* Get the voltage */
- ps_value = NULL;
- voltage = INVALID_VALUE;
- if (CFDictionaryGetValueIfPresent (ps_dict,
- CFSTR (kIOPSVoltageKey),
- &ps_value))
- {
- if (CFGetTypeID (ps_value) != CFNumberGetTypeID ())
- CFNumberGetValue (ps_value,
- kCFNumberDoubleType,
- &voltage);
- else
- DBG ("kIOPSVoltageKey: Not a CFNumber");
- DBG ("voltage = %f", voltage);
- }
- else
- DBG ("`%s' does not exist", kIOPSVoltageKey);
+ /* This is the charge in percent. */
+ temp_double = dict_get_double (ps_dict,
+ kIOPSCurrentCapacityKey);
+ if ((temp_double != INVALID_VALUE)
+ && (temp_double >= 0.0)
+ && (temp_double <= 100.0))
+ *ret_charge = temp_double;
+ }
+
+ if (*ret_current == INVALID_VALUE)
+ {
+ temp_double = dict_get_double (ps_dict,
+ kIOPSCurrentKey);
+ if (temp_double != INVALID_VALUE)
+ *ret_current = temp_double / 1000.0;
+ }
+
+ if (*ret_voltage == INVALID_VALUE)
+ {
+ temp_double = dict_get_double (ps_dict,
+ kIOPSVoltageKey);
+ if (temp_double != INVALID_VALUE)
+ *ret_voltage = temp_double / 1000.0;
+ }
+ }
+
+ CFRelease(ps_array);
+ CFRelease(ps_raw);
+}
+#endif /* HAVE_IOKIT_PS_IOPOWERSOURCES_H */
+
+#if HAVE_IOKIT_IOKITLIB_H
+static void get_via_generic_iokit (double *ret_charge,
+ double *ret_current,
+ double *ret_voltage)
+{
+ kern_return_t status;
+ io_iterator_t iterator;
+ io_object_t io_obj;
+
+ CFDictionaryRef bat_root_dict;
+ CFArrayRef bat_info_arry;
+ CFIndex bat_info_arry_len;
+ CFIndex bat_info_arry_pos;
+ CFDictionaryRef bat_info_dict;
+
+ double temp_double;
+
+ status = IOServiceGetMatchingServices (kIOMasterPortDefault,
+ IOServiceNameMatching ("battery"),
+ &iterator);
+ if (status != kIOReturnSuccess)
+ {
+ DEBUG ("IOServiceGetMatchingServices failed.");
+ return;
+ }
+
+ while ((io_obj = IOIteratorNext (iterator)))
+ {
+ status = IORegistryEntryCreateCFProperties (io_obj,
+ (CFMutableDictionaryRef *) &bat_root_dict,
+ kCFAllocatorDefault,
+ kNilOptions);
+ if (status != kIOReturnSuccess)
+ {
+ DEBUG ("IORegistryEntryCreateCFProperties failed.");
+ continue;
+ }
+
+ bat_info_arry = (CFArrayRef) CFDictionaryGetValue (bat_root_dict,
+ CFSTR ("IOBatteryInfo"));
+ if (bat_info_arry == NULL)
+ {
+ CFRelease (bat_root_dict);
+ continue;
+ }
+ bat_info_arry_len = CFArrayGetCount (bat_info_arry);
- /* Get the name of the device.. */
- ps_value = NULL;
- if (CFDictionaryGetValueIfPresent (ps_dict,
- CFSTR (kIOPSNameKey),
- &ps_value))
+ for (bat_info_arry_pos = 0;
+ bat_info_arry_pos < bat_info_arry_len;
+ bat_info_arry_pos++)
+ {
+ bat_info_dict = (CFDictionaryRef) CFArrayGetValueAtIndex (bat_info_arry, bat_info_arry_pos);
+
+ if (*ret_charge == INVALID_VALUE)
{
- if (CFGetTypeID (ps_value) != CFStringGetTypeID ())
- {
- if (!CFStringGetCString (ps_value,
- name, 128,
- kCFStringEncodingASCII))
- continue;
- }
- else
- {
- DBG ("kIOPSNameKey: Not a CFStringGetTypeID");
- }
- DBG ("Original string: `%s'", name);
+ temp_double = dict_get_double (bat_info_dict,
+ "Capacity");
+ if (temp_double != INVALID_VALUE)
+ *ret_charge = temp_double / 1000.0;
}
- else
+
+ if (*ret_current == INVALID_VALUE)
{
- strncpy (name, "unknown", 128);
+ temp_double = dict_get_double (bat_info_dict,
+ "Current");
+ if (temp_double != INVALID_VALUE)
+ *ret_current = temp_double / 1000.0;
}
- name[127] = '\0';
- for (i = 0; i < 128; i++)
+
+ if (*ret_voltage == INVALID_VALUE)
{
- if (name[i] == '\0')
- break;
- else if (isalnum (name[i]))
- name[i] = (char) tolower (name[i]);
- else
- name[i] = '_';
+ temp_double = dict_get_double (bat_info_dict,
+ "Voltage");
+ if (temp_double != INVALID_VALUE)
+ *ret_voltage = temp_double / 1000.0;
}
-
- battery_submit (name, current, voltage, charge);
}
+
+ CFRelease (bat_root_dict);
}
- CFRelease(ps_array);
- CFRelease(ps_raw);
-/* #endif HAVE_IOKIT_PS_IOPOWERSOURCES_H */
+ IOObjectRelease (iterator);
+}
+#endif /* HAVE_IOKIT_IOKITLIB_H */
+
+#if KERNEL_LINUX
+static int battery_read_acpi (const char *name)
+{
+ double current = INVALID_VALUE;
+ double voltage = INVALID_VALUE;
+ double charge = INVALID_VALUE;
+ double *valptr = NULL;
+ int charging = 0;
+
+ char filename[256];
+ FILE *fh;
+
+ char buffer[1024];
+ char *fields[8];
+ int numfields;
+ char *endptr;
+ int len;
+
+ len = ssnprintf (filename, sizeof (filename), "%s/%s/state", battery_acpi_dir, name);
+
+ if ((len < 0) || ((unsigned int)len >= sizeof (filename)))
+ return -1;
+
+ if ((fh = fopen (filename, "r")) == NULL) {
+ char errbuf[1024];
+ ERROR ("Cannot open `%s': %s", filename,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ return -1;
+ }
+
+ /*
+ * [11:00] <@tokkee> $ cat /proc/acpi/battery/BAT1/state
+ * [11:00] <@tokkee> present: yes
+ * [11:00] <@tokkee> capacity state: ok
+ * [11:00] <@tokkee> charging state: charging
+ * [11:00] <@tokkee> present rate: 1724 mA
+ * [11:00] <@tokkee> remaining capacity: 4136 mAh
+ * [11:00] <@tokkee> present voltage: 12428 mV
+ */
+ while (fgets (buffer, sizeof (buffer), fh) != NULL)
+ {
+ numfields = strsplit (buffer, fields, 8);
+
+ if (numfields < 3)
+ continue;
+
+ if ((strcmp (fields[0], "charging") == 0)
+ && (strcmp (fields[1], "state:") == 0))
+ {
+ if (strcmp (fields[2], "charging") == 0)
+ charging = 1;
+ else
+ charging = 0;
+ continue;
+ }
+
+ if ((strcmp (fields[0], "present") == 0)
+ && (strcmp (fields[1], "rate:") == 0))
+ valptr = ¤t;
+ else if ((strcmp (fields[0], "remaining") == 0)
+ && (strcmp (fields[1], "capacity:") == 0))
+ valptr = &charge;
+ else if ((strcmp (fields[0], "present") == 0)
+ && (strcmp (fields[1], "voltage:") == 0))
+ valptr = &voltage;
+ else
+ continue;
+
+ endptr = NULL;
+ errno = 0;
+ *valptr = strtod (fields[2], &endptr) / 1000.0;
+
+ 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 (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);
+
+ return 0;
+}
+#endif /* KERNEL_LINUX */
+
+
+static int battery_read (void)
+{
+#if HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H
+ 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_rel, ¤t, &voltage);
+#endif
+#if HAVE_IOKIT_IOKITLIB_H
+ get_via_generic_iokit (&charge_abs, ¤t, &voltage);
+#endif
+
+ 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;
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 = ssnprintf (filename, sizeof (filename), battery_pmu_file, i);
+ if ((len < 0) || ((unsigned int)len >= sizeof (filename)))
continue;
- len = snprintf (batnum_str, BUFSIZE, "%i", i);
- if ((len >= BUFSIZE) || (len < 0))
+ len = ssnprintf (batnum_str, sizeof (batnum_str), "%i", i);
+ if ((len < 0) || ((unsigned int)len >= sizeof (batnum_str)))
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);
}
}
- if ((current != INVALID_VALUE)
- || (voltage != INVALID_VALUE)
- || (charge != INVALID_VALUE))
- battery_submit (batnum_str, current, voltage, charge);
-
fclose (fh);
fh = NULL;
- }
-
- if (access ("/proc/acpi/battery", R_OK | X_OK) == 0)
- {
- double current = INVALID_VALUE;
- double voltage = INVALID_VALUE;
- double charge = INVALID_VALUE;
- double *valptr = NULL;
- int charging = 0;
-
- struct dirent *ent;
- DIR *dh;
- if ((dh = opendir ("/proc/acpi/battery")) == NULL)
- {
- syslog (LOG_ERR, "Cannot open `/proc/acpi/battery': %s", strerror (errno));
- return;
- }
-
- while ((ent = readdir (dh)) != NULL)
- {
- if (ent->d_name[0] == '.')
- continue;
-
- len = snprintf (filename, BUFSIZE, "/proc/acpi/battery/%s/state", ent->d_name);
- if ((len >= BUFSIZE) || (len < 0))
- continue;
-
- if ((fh = fopen (filename, "r")) == NULL)
- {
- syslog (LOG_ERR, "Cannot open `%s': %s", filename, strerror (errno));
- continue;
- }
-
- /*
- * [11:00] <@tokkee> $ cat /proc/acpi/battery/BAT1/state
- * [11:00] <@tokkee> present: yes
- * [11:00] <@tokkee> capacity state: ok
- * [11:00] <@tokkee> charging state: charging
- * [11:00] <@tokkee> present rate: 1724 mA
- * [11:00] <@tokkee> remaining capacity: 4136 mAh
- * [11:00] <@tokkee> present voltage: 12428 mV
- */
- while (fgets (buffer, BUFSIZE, fh) != NULL)
- {
- numfields = strsplit (buffer, fields, 8);
-
- if (numfields < 3)
- continue;
-
- if ((strcmp (fields[0], "present") == 0)
- && (strcmp (fields[1], "rate:") == 0))
- valptr = ¤t;
- else if ((strcmp (fields[0], "remaining") == 0)
- && (strcmp (fields[1], "capacity:") == 0))
- valptr = &charge;
- else if ((strcmp (fields[0], "present") == 0)
- && (strcmp (fields[1], "voltage:") == 0))
- valptr = &voltage;
- else
- valptr = NULL;
-
- if ((strcmp (fields[0], "charging") == 0)
- && (strcmp (fields[1], "state:") == 0))
- {
- if (strcmp (fields[2], "charging") == 0)
- charging = 1;
- else
- charging = 0;
- }
-
- if (valptr != NULL)
- {
- char *endptr;
-
- endptr = NULL;
- errno = 0;
-
- *valptr = strtod (fields[2], &endptr) / 1000.0;
-
- if ((fields[2] == endptr) || (errno != 0))
- *valptr = INVALID_VALUE;
- }
- }
-
- if ((current != INVALID_VALUE) && (charging == 0))
- current *= -1;
+ 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 ((current != INVALID_VALUE)
- || (voltage != INVALID_VALUE)
- || (charge != INVALID_VALUE))
- battery_submit (ent->d_name, current, voltage, charge);
+ walk_directory (battery_acpi_dir, battery_read_acpi);
- fclose (fh);
- }
-
- 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
+ plugin_register_init ("battery", battery_init);
+ plugin_register_read ("battery", battery_read);
+} /* void module_register */
projects / collectd.git / blobdiff