processes: Solaris: Consistently use long to represent a pid

[collectd.git] / src / swap.c

diff --git a/src/swap.c b/src/swap.c
index 46d3534..fb50cf3 100644 (file)
--- a/src/swap.c
+++ b/src/swap.c
@@ -160,6 +160,8 @@ static int swap_init (void) /* {{{ */
 /* #endif defined(VM_SWAPUSAGE) */
 
 #elif HAVE_LIBKVM_GETSWAPINFO
+       char errbuf[_POSIX2_LINE_MAX];
+
        if (kvm_obj != NULL)
        {
                kvm_close (kvm_obj);
@@ -168,14 +170,11 @@ static int swap_init (void) /* {{{ */
 
        kvm_pagesize = getpagesize ();
 
-       if ((kvm_obj = kvm_open (NULL, /* execfile */
-                                       NULL, /* corefile */
-                                       NULL, /* swapfile */
-                                       O_RDONLY, /* flags */
-                                       NULL)) /* errstr */
-                       == NULL)
+       kvm_obj = kvm_openfiles (NULL, "/dev/null", NULL, O_RDONLY, errbuf);
+
+       if (kvm_obj == NULL)
        {
-               ERROR ("swap plugin: kvm_open failed.");
+               ERROR ("swap plugin: kvm_openfiles failed, %s", errbuf);
                return (-1);
        }
 /* #endif HAVE_LIBKVM_GETSWAPINFO */
@@ -339,7 +338,7 @@ static int swap_read_combined (void) /* {{{ */
 
        fclose (fh);
 
-       if (have_data != 0x07)
+       if ((have_data & 0x03) != 0x03)
                return (ENOENT);
 
        if (isnan (swap_total)
@@ -351,7 +350,8 @@ static int swap_read_combined (void) /* {{{ */
 
        swap_submit_gauge (NULL, "used",   1024.0 * swap_used);
        swap_submit_gauge (NULL, "free",   1024.0 * swap_free);
-       swap_submit_gauge (NULL, "cached", 1024.0 * swap_cached);
+       if (have_data & 0x04)
+               swap_submit_gauge (NULL, "cached", 1024.0 * swap_cached);
 
        return (0);
 } /* }}} int swap_read_combined */