swap plugin: Added support for OpenBSD and possibly other *BSDs.

diff --git a/ChangeLog b/ChangeLog
index 01f44cbaeb3556fdb3c4e54a7b91f5ba22c291a7..2076d207a4fa1ec17c68ddb1da63b1d5565f5895 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,8 @@
          RRD accelerator daemon, rrdcached. This daemon works very similar to
          the original rrdtool plugin of collectd, but adds some more nice
          features.
          RRD accelerator daemon, rrdcached. This daemon works very similar to
          the original rrdtool plugin of collectd, but adds some more nice
          features.

+       * swap plugin: Code for OpenBSD (and possibly other *BSDs) has been
+         added.

 
 2009-01-02, Version 4.5.2
        * build system: Check for `mysql.h' and `mysql/mysql.h', since the
 
 2009-01-02, Version 4.5.2
        * build system: Check for `mysql.h' and `mysql/mysql.h', since the

diff --git a/configure.in b/configure.in
index 80e7e4053c99434bb0c9af4b3a08afa00447c974..bd8ca1dd08541d1427e1f61a8f8c11ea437fd42d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -491,6 +491,7 @@ AC_CHECK_FUNCS(getifaddrs, [have_getifaddrs="yes"], [have_getifaddrs="no"])
 AC_CHECK_FUNCS(syslog, [have_syslog="yes"], [have_syslog="no"])
 AC_CHECK_FUNCS(getutent, [have_getutent="yes"], [have_getutent="no"])
 AC_CHECK_FUNCS(getutxent, [have_getutxent="yes"], [have_getutxent="no"])
 AC_CHECK_FUNCS(syslog, [have_syslog="yes"], [have_syslog="no"])
 AC_CHECK_FUNCS(getutent, [have_getutent="yes"], [have_getutent="no"])
 AC_CHECK_FUNCS(getutxent, [have_getutxent="yes"], [have_getutxent="no"])

+AC_CHECK_FUNCS(swapctl, [have_swapctl="yes"], [have_swapctl="no"])

 
 # For load module
 AC_CHECK_FUNCS(getloadavg, [have_getloadavg="yes"], [have_getloadavg="no"])
 
 # For load module
 AC_CHECK_FUNCS(getloadavg, [have_getloadavg="yes"], [have_getloadavg="no"])


@@ -3023,6 +3024,11 @@ then
        plugin_swap="yes"
 fi
 
        plugin_swap="yes"
 fi
 

+if test "x$have_swapctl" = "xyes"
+then
+       plugin_swap="yes"
+fi
+

 if test "x$with_kvm_openfiles$with_kvm_nlist" = "xyesyes"
 then
        plugin_tcpconns="yes"
 if test "x$with_kvm_openfiles$with_kvm_nlist" = "xyesyes"
 then
        plugin_tcpconns="yes"

diff --git a/src/swap.c b/src/swap.c
index b8b5f09830629e57dd34c80b739a38e0e7e6cee3..425742e9ef24f33749503aa9a953976cc897d4d6 100644 (file)
--- a/src/swap.c
+++ b/src/swap.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/swap.c
 /**
  * collectd - src/swap.c

- * Copyright (C) 2005-2007  Florian octo Forster
+ * Copyright (C) 2005-2009  Florian octo Forster

  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the


@@ -32,6 +32,9 @@
 #if HAVE_SYS_SYSCTL_H
 #  include <sys/sysctl.h>
 #endif
 #if HAVE_SYS_SYSCTL_H
 #  include <sys/sysctl.h>
 #endif

+#if HAVE_SYS_DKSTAT_H
+#  include <sys/dkstat.h>
+#endif

 #if HAVE_KVM_H
 #  include <kvm.h>
 #endif
 #if HAVE_KVM_H
 #  include <kvm.h>
 #endif


@@ -52,6 +55,10 @@ static unsigned long long pagesize;
 static kstat_t *ksp;
 /* #endif HAVE_LIBKSTAT */
 
 static kstat_t *ksp;
 /* #endif HAVE_LIBKSTAT */
 

+#elif HAVE_SWAPCTL
+/* No global variables */
+/* #endif HAVE_SWAPCTL */
+

 #elif defined(VM_SWAPUSAGE)
 /* No global variables */
 /* #endif defined(VM_SWAPUSAGE) */
 #elif defined(VM_SWAPUSAGE)
 /* No global variables */
 /* #endif defined(VM_SWAPUSAGE) */


@@ -82,6 +89,10 @@ static int swap_init (void)
                ksp = NULL;
 /* #endif HAVE_LIBKSTAT */
 
                ksp = NULL;
 /* #endif HAVE_LIBKSTAT */
 

+#elif HAVE_SWAPCTL
+       /* No init stuff */
+/* #endif HAVE_SWAPCTL */
+

 #elif defined(VM_SWAPUSAGE)
        /* No init stuff */
 /* #endif defined(VM_SWAPUSAGE) */
 #elif defined(VM_SWAPUSAGE)
        /* No init stuff */
 /* #endif defined(VM_SWAPUSAGE) */


@@ -239,6 +250,74 @@ static int swap_read (void)
        swap_submit ("reserved", swap_resv);
 /* #endif HAVE_LIBKSTAT */
 
        swap_submit ("reserved", swap_resv);
 /* #endif HAVE_LIBKSTAT */
 

+#elif HAVE_SWAPCTL
+       struct swapent *swap_entries;
+       int swap_num;
+       int status;
+       int i;
+
+       uint64_t used  = 0;
+       uint64_t total = 0;
+
+       /*
+        * XXX: This is the syntax for the *BSD `swapctl', which has the
+        * following prototype:
+        *   swapctl (int cmd, void *arg, int misc);
+        *
+        * HP-UX and Solaris (and possibly other UNIXes) provide `swapctl',
+        * too, but with the following prototype:
+        *   swapctl (int cmd, void *arg);
+        *
+        * Solaris is usually handled in the KSTAT case above. For other UNIXes
+        * a separate case for the other version of `swapctl' may be necessary.
+        */
+       swap_num = swapctl (SWAP_NSWAP, NULL, 0);
+       if (swap_num < 0)
+       {
+               ERROR ("swap plugin: swapctl (SWAP_NSWAP) failed with status %i.",
+                               swap_num);
+               return (-1);
+       }
+       else if (swap_num == 0)
+               return (0);
+
+       swap_entries = calloc (swap_num, sizeof (*swap_entries));
+       if (swap_entries == NULL)
+       {
+               ERROR ("swap plugin: calloc failed.");
+               return (-1);
+       }
+
+       status = swapctl (SWAP_STATS, swap_entries, swap_num);
+       if (status != swap_entries)
+       {
+               ERROR ("swap plugin: swapctl (SWAP_STATS) failed with status %i.",
+                               status);
+               sfree (swap_entries);
+               return (-1);
+       }
+
+#if defined(DEV_BSIZE) && (DEV_BSIZE > 0)
+# define C_SWAP_BLOCK_SIZE DEV_BSIZE
+#else
+# define C_SWAP_BLOCK_SIZE 512
+#endif
+
+       for (i = 0; i < swap_entries; i++)
+       {
+               if ((swap_entries[i].se_flags & SWF_ENABLE) == 0)
+                       continue;
+
+               used = swap_entries[i].se_inuse  * C_SWAP_BLOCK_SIZE;
+               total = swap_entries[i].se_nblks * C_SWAP_BLOCK_SIZE;
+       }
+
+       swap_submit ("used", (gauge_t) used);
+       swap_submit ("free", (gauge_t) (total - used));
+
+       sfree (swap_entries);
+/* #endif HAVE_SWAPCTL */
+

 #elif defined(VM_SWAPUSAGE)
        int              mib[3];
        size_t           mib_len;
 #elif defined(VM_SWAPUSAGE)
        int              mib[3];
        size_t           mib_len;