#include "collectd.h"
#include "common.h"
#include "plugin.h"
-#include "utils_debug.h"
#if HAVE_MACH_MACH_TYPES_H
# include <mach/mach_types.h>
#define INVALID_VALUE 47841.29
-static data_source_t data_source_charge[1] =
-{
- {"charge", DS_TYPE_GAUGE, 0, NAN}
-};
-
-static data_set_t charge_ds =
-{
- "charge", 1, data_source_charge
-};
-
-static data_source_t data_source_current[1] =
-{
- {"current", DS_TYPE_GAUGE, NAN, NAN}
-};
-
-static data_set_t current_ds =
-{
- "current", 1, data_source_current
-};
-
-static data_source_t data_source_voltage[1] =
-{
- {"voltage", DS_TYPE_GAUGE, NAN, NAN}
-};
-
-static data_set_t voltage_ds =
-{
- "voltage", 1, data_source_voltage
-};
-
#if BATTERY_HAVE_READ
#if HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H
/* No global variables */
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- strcpy (vl.host, hostname);
+ strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "battery");
strcpy (vl.plugin_instance, plugin_instance);
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.", key_string);
+ DEBUG ("CFDictionaryGetValue (%s) failed.", key_string);
CFRelease (key_obj);
return (INVALID_VALUE);
}
}
else
{
- DBG ("CFGetTypeID (val_obj) = %i", (int) CFGetTypeID (val_obj));
+ DEBUG ("CFGetTypeID (val_obj) = %i", (int) CFGetTypeID (val_obj));
return (INVALID_VALUE);
}
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++)
{
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;
}
&iterator);
if (status != kIOReturnSuccess)
{
- DBG ("IOServiceGetMatchingServices failed.");
+ DEBUG ("IOServiceGetMatchingServices failed.");
return;
}
kNilOptions);
if (status != kIOReturnSuccess)
{
- DBG ("IORegistryEntryCreateCFProperties failed.");
+ DEBUG ("IORegistryEntryCreateCFProperties failed.");
continue;
}
if ((dh = opendir ("/proc/acpi/battery")) == NULL)
{
- syslog (LOG_ERR, "Cannot open `/proc/acpi/battery': %s", strerror (errno));
+ char errbuf[1024];
+ ERROR ("Cannot open `/proc/acpi/battery': %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (-1);
}
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;
}
void module_register (void)
{
- plugin_register_data_set (&charge_ds);
- plugin_register_data_set (¤t_ds);
- plugin_register_data_set (&voltage_ds);
-
#if BATTERY_HAVE_READ
plugin_register_init ("battery", battery_init);
plugin_register_read ("battery", battery_read);
#endif /* BATTERY_HAVE_READ */
-}
+} /* void module_register */