X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbattery.c;h=2e27e60e4bcdce4b0be7452a943ce2d398636f60;hb=57d32cdea9ed71a34cfdf62e8b0050749486319e;hp=64ff994a4144079269a84a6c680207678a79633b;hpb=a3fe18a43186fd295346d023f1ef174566f5708f;p=collectd.git

diff --git a/src/battery.c b/src/battery.c
index 64ff994a..2e27e60e 100644
--- a/src/battery.c
+++ b/src/battery.c
@@ -22,7 +22,6 @@
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
-#include "utils_debug.h"
 
 #if HAVE_MACH_MACH_TYPES_H
 #  include <mach/mach_types.h>
@@ -49,45 +48,12 @@
 #  include <IOKit/ps/IOPSKeys.h>
 #endif
 
-#if HAVE_IOKIT_IOKITLIB_H || 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 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 */
 /* #endif HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H */
@@ -132,7 +98,7 @@ static void battery_submit (const char *plugin_instance, const char *type, doubl
 	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);
 
@@ -151,13 +117,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.", key_string);
+		DEBUG ("CFDictionaryGetValue (%s) failed.", key_string);
 		CFRelease (key_obj);
 		return (INVALID_VALUE);
 	}
@@ -181,7 +147,7 @@ double dict_get_double (CFDictionaryRef dict, char *key_string)
 	}
 	else
 	{
-		DBG ("CFGetTypeID (val_obj) = %i", (int) CFGetTypeID (val_obj));
+		DEBUG ("CFGetTypeID (val_obj) = %i", (int) CFGetTypeID (val_obj));
 		return (INVALID_VALUE);
 	}
 
@@ -207,7 +173,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++)
 	{
@@ -216,13 +182,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;
 		}
 
@@ -283,7 +249,7 @@ static void get_via_generic_iokit (double *ret_charge,
 			&iterator);
 	if (status != kIOReturnSuccess)
 	{
-		DBG ("IOServiceGetMatchingServices failed.");
+		DEBUG ("IOServiceGetMatchingServices failed.");
 		return;
 	}
 
@@ -295,7 +261,7 @@ static void get_via_generic_iokit (double *ret_charge,
 				kNilOptions);
 		if (status != kIOReturnSuccess)
 		{
-			DBG ("IORegistryEntryCreateCFProperties failed.");
+			DEBUG ("IORegistryEntryCreateCFProperties failed.");
 			continue;
 		}
 
@@ -458,7 +424,9 @@ static int battery_read (void)
 
 		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);
 		}
 
@@ -475,7 +443,10 @@ static int battery_read (void)
 
 			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;
 			}
 
@@ -549,16 +520,9 @@ static int battery_read (void)
 
 	return (0);
 }
-#endif /* BATTERY_HAVE_READ */
 
 void module_register (void)
 {
-	plugin_register_data_set (&charge_ds);
-	plugin_register_data_set (&current_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 */