A first port of the `swap' plugin to Mach/Mac OS X

diff --git a/src/swap.c b/src/swap.c
index 089150329bc3e59704e21e33b5344375b92cddb3..e8f05d65ce90aca920fec9ba80eb87193c257f89 100644 (file)
--- a/src/swap.c
+++ b/src/swap.c
@@ -24,18 +24,24 @@
 #include "common.h"
 #include "plugin.h"
 
+#if HAVE_SYS_SWAP_H
+# include <sys/swap.h>
+#endif
+#if HAVE_SYS_PARAM_H
+#  include <sys/param.h>
+#endif
+#if HAVE_SYS_SYSCTL_H
+#  include <sys/sysctl.h>
+#endif
+
 #define MODULE_NAME "swap"
 
-#if defined(KERNEL_LINUX) || defined(KERNEL_SOLARIS) || defined(HAVE_LIBSTATGRAB)
+#if KERNEL_LINUX || HAVE_LIBKSTAT || HAVE_SYS_SYSCTL_H || HAVE_LIBSTATGRAB
 # define SWAP_HAVE_READ 1
 #else
 # define SWAP_HAVE_READ 0
 #endif
 
-#if HAVE_SYS_SWAP_H
-# include <sys/swap.h>
-#endif
-
 #undef  MAX
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
 
@@ -52,19 +58,43 @@ static char *ds_def[] =
 };
 static int ds_num = 4;
 
-#ifdef KERNEL_SOLARIS
+#if KERNEL_LINUX
+/* No global variables */
+/* #endif KERNEL_LINUX */
+
+#elif HAVE_LIBKSTAT
 static int pagesize;
 static kstat_t *ksp;
-#endif /* KERNEL_SOLARIS */
+/* #endif HAVE_LIBKSTAT */
+
+#elif HAVE_SYS_SYSCTL_H
+/* No global variables */
+/* #endif HAVE_SYS_SYSCTL_H */
+
+#elif HAVE_LIBSTATGRAB
+/* No global variables */
+#endif /* HAVE_LIBSTATGRAB */
 
 static void swap_init (void)
 {
-#ifdef KERNEL_SOLARIS
+#if KERNEL_LINUX
+       /* No init stuff */
+/* #endif KERNEL_LINUX */
+
+#elif HAVE_LIBKSTAT
        /* getpagesize(3C) tells me this does not fail.. */
        pagesize = getpagesize ();
        if (get_kstat (&ksp, "unix", 0, "system_pages"))
                ksp = NULL;
-#endif /* KERNEL_SOLARIS */
+/* #endif HAVE_LIBKSTAT */
+
+#elif HAVE_SYS_SYSCTL_H
+       /* No init stuff */
+/* #endif HAVE_SYS_SYSCTL_H */
+
+#elif HAVE_LIBSTATGRAB
+       /* No init stuff */
+#endif /* HAVE_LIBSTATGRAB */
 
        return;
 }
@@ -91,7 +121,7 @@ static void swap_submit (unsigned long long swap_used,
 
 static void swap_read (void)
 {
-#ifdef KERNEL_LINUX
+#if KERNEL_LINUX
        FILE *fh;
        char buffer[1024];
        
@@ -139,9 +169,9 @@ static void swap_read (void)
        swap_used = swap_total - (swap_free + swap_cached);
 
        swap_submit (swap_used, swap_free, swap_cached, -1LL);
-/* #endif defined(KERNEL_LINUX) */
+/* #endif KERNEL_LINUX */
 
-#elif defined(KERNEL_SOLARIS)
+#elif HAVE_LIBKSTAT
        unsigned long long swap_alloc;
        unsigned long long swap_resv;
        unsigned long long swap_avail;
@@ -182,9 +212,27 @@ static void swap_read (void)
        /* swap_free  = pagesize * (ai.ani_free + (availrmem - swapfs_minfree)); */
 
        swap_submit (swap_alloc, swap_avail, -1LL, swap_resv - swap_alloc);
-/* #endif defined(KERNEL_SOLARIS) */
+/* #endif HAVE_LIBKSTAT */
+
+#elif HAVE_SYS_SYSCTL_H
+       int mib[2];
+       struct xsw_usage sw_usage;
+       size_t           sw_usage_len;
+
+       mib[0] = CTL_VM;
+       mib[1] = VM_SWAPUSAGE;
+
+       sw_usage_len = sizeof (struct xsw_usage);
+
+       if (sysctl (mib, 2, &sw_usage, &sw_usage_len, NULL, 0) != 0)
+               return;
+
+       /* FIXME: If this doesn't return the right values, try multiplying it
+        * with sw_usage.xsu_pagesize.  -octo */
+       swap_submit (sw_usage.xsu_used, sw_usage.xsu_avail, -1LL, -1LL);
+/* #endif HAVE_SYS_SYSCTL_H */
 
-#elif defined(HAVE_LIBSTATGRAB)
+#elif HAVE_LIBSTATGRAB
        sg_swap_stats *swap;
 
        if ((swap = sg_get_swap_stats ()) != NULL)