Improved the patch sent by Vincent Strehle' a bit: Mostly indentation and removed...

[collectd.git] / src / swap.c

diff --git a/src/swap.c b/src/swap.c
index c3e399d..a6a4e36 100644 (file)
--- a/src/swap.c
+++ b/src/swap.c
@@ -20,18 +20,22 @@
  *   Florian octo Forster <octo at verplant.org>
  **/
 
-#include "swap.h"
+#include "collectd.h"
+#include "common.h"
+#include "plugin.h"
 
-#if COLLECT_SWAP
 #define MODULE_NAME "swap"
 
+#if defined(KERNEL_LINUX) || defined(KERNEL_SOLARIS) || defined(HAVE_LIBSTATGRAB)
+# define SWAP_HAVE_READ 1
+#else
+# define SWAP_HAVE_READ 0
+#endif
+
 #ifdef KERNEL_SOLARIS
 #include <sys/swap.h>
 #endif /* KERNEL_SOLARIS */
 
-#include "plugin.h"
-#include "common.h"
-
 #undef  MAX
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
 
@@ -40,10 +44,10 @@ static char *swap_file = "swap.rrd";
 /* 1099511627776 == 1TB ought to be enough for anyone ;) */
 static char *ds_def[] =
 {
-       "DS:used:GAUGE:25:0:1099511627776",
-       "DS:free:GAUGE:25:0:1099511627776",
-       "DS:cached:GAUGE:25:0:1099511627776",
-       "DS:resv:GAUGE:25:0:1099511627776",
+       "DS:used:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776",
+       "DS:free:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776",
+       "DS:cached:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776",
+       "DS:resv:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776",
        NULL
 };
 static int ds_num = 4;
@@ -53,7 +57,7 @@ static int pagesize;
 static kstat_t *ksp;
 #endif /* KERNEL_SOLARIS */
 
-void module_init (void)
+static void swap_init (void)
 {
 #ifdef KERNEL_SOLARIS
        /* getpagesize(3C) tells me this does not fail.. */
@@ -65,12 +69,13 @@ void module_init (void)
        return;
 }
 
-void module_write (char *host, char *inst, char *val)
+static void swap_write (char *host, char *inst, char *val)
 {
        rrd_update_file (host, swap_file, val, ds_def, ds_num);
 }
 
-void module_submit (unsigned long long swap_used,
+#if SWAP_HAVE_READ
+static void swap_submit (unsigned long long swap_used,
                unsigned long long swap_free,
                unsigned long long swap_cached,
                unsigned long long swap_resv)
@@ -84,7 +89,7 @@ void module_submit (unsigned long long swap_used,
        plugin_submit (MODULE_NAME, "-", buffer);
 }
 
-void module_read (void)
+static void swap_read (void)
 {
 #ifdef KERNEL_LINUX
        FILE *fh;
@@ -133,7 +138,7 @@ void module_read (void)
 
        swap_used = swap_total - (swap_free + swap_cached);
 
-       module_submit (swap_used, swap_free, swap_cached, -1LL);
+       swap_submit (swap_used, swap_free, swap_cached, -1LL);
 /* #endif defined(KERNEL_LINUX) */
 
 #elif defined(KERNEL_SOLARIS)
@@ -176,21 +181,23 @@ void module_read (void)
        swap_avail = pagesize * (MAX(ai.ani_max - ai.ani_resv, 0) + (availrmem - swapfs_minfree));
        /* swap_free  = pagesize * (ai.ani_free + (availrmem - swapfs_minfree)); */
 
-       module_submit (swap_alloc, swap_avail, -1LL, swap_resv - swap_alloc);
+       swap_submit (swap_alloc, swap_avail, -1LL, swap_resv - swap_alloc);
 /* #endif defined(KERNEL_SOLARIS) */
 
 #elif defined(HAVE_LIBSTATGRAB)
        sg_swap_stats *swap;
 
        if ((swap = sg_get_swap_stats ()) != NULL)
-               module_submit (swap->used, swap->free, -1LL, -1LL);
+               swap_submit (swap->used, swap->free, -1LL, -1LL);
 #endif /* HAVE_LIBSTATGRAB */
 }
+#else
+# define swap_read NULL
+#endif /* SWAP_HAVE_READ */
 
 void module_register (void)
 {
-       plugin_register (MODULE_NAME, module_init, module_read, module_write);
+       plugin_register (MODULE_NAME, swap_init, swap_read, swap_write);
 }
 
 #undef MODULE_NAME
-#endif /* COLLECT_SWAP */