X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fswap.c;h=7f41c9eae263d664bd6d05dbf0439b6ac486168f;hb=3b4201d2235c25ed21174c41c526c9b7894de539;hp=22eda1f5aaf853e5cfdc911cbcc6e8af62738744;hpb=beb06e98c5aea9272c5972eee372b42c6abdd2b0;p=collectd.git

diff --git a/src/swap.c b/src/swap.c
index 22eda1f5..7f41c9ea 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -2,6 +2,7 @@
  * collectd - src/swap.c
  * Copyright (C) 2005-2009  Florian octo Forster
  * Copyright (C) 2009       Stefan Völkel
+ * Copyright (C) 2009       Manuel Sanmartin
  *
  * 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
@@ -18,6 +19,7 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Manuel Sanmartin
  **/
 
 #if HAVE_CONFIG_H
@@ -57,6 +59,11 @@
 # include <statgrab.h>
 #endif
 
+#if HAVE_PERFSTAT
+# include <sys/protosw.h>
+# include <libperfstat.h>
+#endif
+
 #undef  MAX
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
 
@@ -86,6 +93,11 @@ int kvm_pagesize;
 /* No global variables */
 /* #endif HAVE_LIBSTATGRAB */
 
+#elif HAVE_PERFSTAT
+static int pagesize;
+static perfstat_memory_total_t pmemory;
+/*# endif HAVE_PERFSTAT */ 
+
 #else
 # error "No applicable input method."
 #endif /* HAVE_LIBSTATGRAB */
@@ -134,7 +146,11 @@ static int swap_init (void)
 
 #elif HAVE_LIBSTATGRAB
 	/* No init stuff */
-#endif /* HAVE_LIBSTATGRAB */
+/* #endif HAVE_LIBSTATGRAB */
+
+#elif HAVE_PERFSTAT
+	pagesize = getpagesize();
+#endif /* HAVE_PERFSTAT */
 
 	return (0);
 }
@@ -173,7 +189,7 @@ static int swap_read (void)
 #if KERNEL_LINUX
 	FILE *fh;
 	char buffer[1024];
-	
+
 	char *fields[8];
 	int numfields;
 
@@ -449,7 +465,19 @@ static int swap_read (void)
 
 	swap_submit ("used", (derive_t) swap->used, DS_TYPE_GAUGE);
 	swap_submit ("free", (derive_t) swap->free, DS_TYPE_GAUGE);
-#endif /* HAVE_LIBSTATGRAB */
+/* #endif  HAVE_LIBSTATGRAB */
+
+#elif HAVE_PERFSTAT
+        if(perfstat_memory_total(NULL, &pmemory, sizeof(perfstat_memory_total_t), 1) < 0)
+	{
+                char errbuf[1024];
+                WARNING ("memory plugin: perfstat_memory_total failed: %s",
+                        sstrerror (errno, errbuf, sizeof (errbuf)));
+                return (-1);
+        }
+	swap_submit ("used", (derive_t) (pmemory.pgsp_total - pmemory.pgsp_free) * pagesize, DS_TYPE_GAUGE);
+	swap_submit ("free", (derive_t) pmemory.pgsp_free * pagesize , DS_TYPE_GAUGE);
+#endif /* HAVE_PERFSTAT */
 
 	return (0);
 } /* int swap_read */