X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnut.c;h=edc48c61510ab6e716abe17b52d222136ee7ceba;hb=218635ab44a8533ef5b23fd1ae78be761ff0600c;hp=f6b9fafd4c5f441843949362ad7d1f7649f73494;hpb=967ca89616bf9ccf246eeacf53fc84eb70743386;p=collectd.git

diff --git a/src/nut.c b/src/nut.c
index f6b9fafd..edc48c61 100644
--- a/src/nut.c
+++ b/src/nut.c
@@ -23,103 +23,22 @@
 #include "common.h"
 #include "plugin.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
+#include <pthread.h>
+#include <upsclient.h>
 
-#if HAVE_UPSCLIENT_H
-# include <upsclient.h>
-# define NUT_HAVE_READ 1
+#if HAVE_UPSCONN_T
+typedef UPSCONN_t collectd_upsconn_t;
+#elif HAVE_UPSCONN
+typedef UPSCONN collectd_upsconn_t;
 #else
-# define NUT_HAVE_READ 0
+# error "Unable to determine the UPS connection type."
 #endif
 
-static data_source_t data_source_current[1] =
-{
-  {"value", DS_TYPE_GAUGE, NAN, NAN}
-};
-
-static data_set_t ds_current =
-{
-  "current", 1, data_source_current
-};
-
-static data_source_t data_source_humidity[1] =
-{
-  {"value", DS_TYPE_GAUGE, 0.0, 100.0}
-};
-
-static data_set_t ds_humidity =
-{
-  "humidity", 1, data_source_humidity
-};
-
-static data_source_t data_source_power[1] =
-{
-  {"value", DS_TYPE_GAUGE, 0.0, NAN}
-};
-
-static data_set_t ds_power =
-{
-  "power", 1, data_source_power
-};
-
-static data_source_t data_source_voltage[1] =
-{
-  {"value", DS_TYPE_GAUGE, NAN, NAN}
-};
-
-static data_set_t ds_voltage =
-{
-  "voltage", 1, data_source_voltage
-};
-
-static data_source_t data_source_percent[1] =
-{
-  {"percent", DS_TYPE_GAUGE, 0, 100.1}
-};
-
-static data_set_t ds_percent =
-{
-  "percent", 1, data_source_percent
-};
-
-static data_source_t data_source_timeleft[1] =
-{
-  {"timeleft", DS_TYPE_GAUGE, 0, 100.0}
-};
-
-static data_set_t ds_timeleft =
-{
-  "timeleft", 1, data_source_timeleft
-};
-
-static data_source_t data_source_temperature[1] =
-{
-  {"value", DS_TYPE_GAUGE, -273.15, NAN}
-};
-
-static data_set_t ds_temperature =
-{
-  "temperature", 1, data_source_temperature
-};
-
-static data_source_t data_source_frequency[1] =
-{
-  {"frequency", DS_TYPE_GAUGE, 0, NAN}
-};
-
-static data_set_t ds_frequency =
-{
-  "frequency", 1, data_source_frequency
-};
-
-#if NUT_HAVE_READ
 struct nut_ups_s;
 typedef struct nut_ups_s nut_ups_t;
 struct nut_ups_s
 {
-  UPSCONN   *conn;
+  collectd_upsconn_t *conn;
   char      *upsname;
   char      *hostname;
   int        port;
@@ -204,21 +123,17 @@ static void nut_submit (nut_ups_t *ups, const char *type,
 
   vl.values = values;
   vl.values_len = STATIC_ARRAY_SIZE (values);
-  vl.time = time (NULL);
-  strncpy (vl.host,
+  sstrncpy (vl.host,
       (strcasecmp (ups->hostname, "localhost") == 0)
       ? hostname_g
       : ups->hostname,
       sizeof (vl.host));
-  strcpy (vl.plugin, "nut");
-  strncpy (vl.plugin_instance, ups->upsname, sizeof (vl.plugin_instance));
-  strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+  sstrncpy (vl.plugin, "nut", sizeof (vl.plugin));
+  sstrncpy (vl.plugin_instance, ups->upsname, sizeof (vl.plugin_instance));
+  sstrncpy (vl.type, type, sizeof (vl.type));
+  sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-  vl.host[sizeof (vl.host) - 1] = '\0';
-  vl.plugin_instance[sizeof (vl.plugin_instance) - 1] = '\0';
-  vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
-
-  plugin_dispatch_values (type, &vl);
+  plugin_dispatch_values (&vl);
 } /* void nut_submit */
 
 static int nut_read_one (nut_ups_t *ups)
@@ -232,7 +147,7 @@ static int nut_read_one (nut_ups_t *ups)
   /* (Re-)Connect if we have no connection */
   if (ups->conn == NULL)
   {
-    ups->conn = (UPSCONN *) malloc (sizeof (UPSCONN));
+    ups->conn = (collectd_upsconn_t *) malloc (sizeof (collectd_upsconn_t));
     if (ups->conn == NULL)
     {
       ERROR ("nut plugin: malloc failed.");
@@ -366,30 +281,12 @@ static int nut_shutdown (void)
 
   return (0);
 } /* int nut_shutdown */
-#endif /* NUT_HAVE_READ */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-  if (load & MR_DATASETS)
-  {
-    plugin_register_data_set (&ds_current);
-    plugin_register_data_set (&ds_humidity);
-    plugin_register_data_set (&ds_power);
-    plugin_register_data_set (&ds_voltage);
-    plugin_register_data_set (&ds_percent);
-    plugin_register_data_set (&ds_timeleft);
-    plugin_register_data_set (&ds_temperature);
-    plugin_register_data_set (&ds_frequency);
-  }
-
-#if NUT_HAVE_READ
-  if (load & MR_READ)
-  {
-    plugin_register_config ("nut", nut_config, config_keys, config_keys_num);
-    plugin_register_read ("nut", nut_read);
-    plugin_register_shutdown ("nut", nut_shutdown);
-  }
-#endif
+  plugin_register_config ("nut", nut_config, config_keys, config_keys_num);
+  plugin_register_read ("nut", nut_read);
+  plugin_register_shutdown ("nut", nut_shutdown);
 } /* void module_register */
 
 /* vim: set sw=2 ts=8 sts=2 tw=78 : */