Unified string handling.

[collectd.git] / src / swap.c

diff --git a/src/swap.c b/src/swap.c
index 8e04044..362a2a8 100644 (file)
--- a/src/swap.c
+++ b/src/swap.c
@@ -36,26 +36,9 @@
 #  include <kvm.h>
 #endif
 
-#if KERNEL_LINUX || HAVE_LIBKSTAT || defined(VM_SWAPUSAGE) || HAVE_LIBKVM || HAVE_LIBSTATGRAB
-# define SWAP_HAVE_READ 1
-#else
-# define SWAP_HAVE_READ 0
-#endif
-
 #undef  MAX
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
 
-static data_source_t data_source[1] =
-{
-       {"value", DS_TYPE_GAUGE, 0, 1099511627776.0}
-};
-
-static data_set_t data_set =
-{
-       "swap", 1, data_source
-};
-
-#if SWAP_HAVE_READ
 #if KERNEL_LINUX
 /* No global variables */
 /* #endif KERNEL_LINUX */
@@ -76,6 +59,10 @@ int kvm_pagesize;
 
 #elif HAVE_LIBSTATGRAB
 /* No global variables */
+/* #endif HAVE_LIBSTATGRAB */
+
+#else
+# error "No applicable input method."
 #endif /* HAVE_LIBSTATGRAB */
 
 static int swap_init (void)
@@ -111,7 +98,7 @@ static int swap_init (void)
                                        NULL)) /* errstr */
                        == NULL)
        {
-               syslog (LOG_ERR, "swap plugin: kvm_open failed.");
+               ERROR ("swap plugin: kvm_open failed.");
                return (-1);
        }
 /* #endif HAVE_LIBKVM */
@@ -135,9 +122,10 @@ static void swap_submit (const char *type_instance, double value)
        vl.time = time (NULL);
        strcpy (vl.host, hostname_g);
        strcpy (vl.plugin, "swap");
-       strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+       strcpy (vl.type, "swap");
+       sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-       plugin_dispatch_values ("swap", &vl);
+       plugin_dispatch_values (&vl);
 } /* void swap_submit */
 
 static int swap_read (void)
@@ -156,7 +144,9 @@ static int swap_read (void)
 
        if ((fh = fopen ("/proc/meminfo", "r")) == NULL)
        {
-               syslog (LOG_WARNING, "memory: fopen: %s", strerror (errno));
+               char errbuf[1024];
+               WARNING ("memory: fopen: %s",
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
                return (-1);
        }
 
@@ -182,7 +172,11 @@ static int swap_read (void)
        }
 
        if (fclose (fh))
-               syslog (LOG_WARNING, "memory: fclose: %s", strerror (errno));
+       {
+               char errbuf[1024];
+               WARNING ("memory: fclose: %s",
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
+       }
 
        if ((swap_total == 0LL) || ((swap_free + swap_cached) > swap_total))
                return (-1);
@@ -203,8 +197,9 @@ static int swap_read (void)
 
        if (swapctl (SC_AINFO, &ai) == -1)
        {
-               syslog (LOG_ERR, "swap plugin: swapctl failed: %s",
-                               strerror (errno));
+               char errbuf[1024];
+               ERROR ("swap plugin: swapctl failed: %s",
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
                return (-1);
        }
 
@@ -238,7 +233,7 @@ static int swap_read (void)
 
        swap_submit ("used", swap_alloc);
        swap_submit ("free", swap_avail);
-       swap_submit ("reserved", swap_resv - swap_alloc);
+       swap_submit ("reserved", swap_resv);
 /* #endif HAVE_LIBKSTAT */
 
 #elif defined(VM_SWAPUSAGE)
@@ -303,14 +298,9 @@ static int swap_read (void)
 
        return (0);
 } /* int swap_read */
-#endif /* SWAP_HAVE_READ */
 
 void module_register (void)
 {
-       plugin_register_data_set (&data_set);
-
-#if SWAP_HAVE_READ
        plugin_register_init ("swap", swap_init);
        plugin_register_read ("swap", swap_read);
-#endif /* SWAP_HAVE_READ */
-}
+} /* void module_register */