X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fswap.c;h=46ba6652953726ce0b7d90aecea2345f681ec64b;hb=9754d84492908f5e02cc16c45955a433028ee66b;hp=1a152c9069c4eff54dcbb23d2918da286f0abea5;hpb=25fd1667c186eb871a4b66f9866d6446e41f1bc2;p=collectd.git

diff --git a/src/swap.c b/src/swap.c
index 1a152c90..46ba6652 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/swap.c
- * Copyright (C) 2005-2012  Florian octo Forster
+ * Copyright (C) 2005-2009  Florian octo Forster
  * Copyright (C) 2009       Stefan Völkel
  * Copyright (C) 2009       Manuel Sanmartin
  *
@@ -68,8 +68,7 @@
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
 
 #if KERNEL_LINUX
-static derive_t pagesize;
-static _Bool report_bytes = 0;
+/* No global variables */
 /* #endif KERNEL_LINUX */
 
 #elif HAVE_LIBKSTAT
@@ -103,16 +102,10 @@ static perfstat_memory_total_t pmemory;
 # error "No applicable input method."
 #endif /* HAVE_LIBSTATGRAB */
 
-static const char *config_keys[] =
-{
-	"ReportBytes"
-};
-static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
-
 static int swap_init (void)
 {
 #if KERNEL_LINUX
-	pagesize = (derive_t) sysconf (_SC_PAGESIZE);
+	/* No init stuff */
 /* #endif KERNEL_LINUX */
 
 #elif HAVE_LIBKSTAT
@@ -291,12 +284,6 @@ static int swap_read (void)
 				sstrerror (errno, errbuf, sizeof (errbuf)));
 	}
 
-	if (report_bytes)
-	{
-		swap_in  *= pagesize;
-		swap_out *= pagesize;
-	}
-
 	swap_submit ("used",   1024 * swap_used,   DS_TYPE_GAUGE);
 	swap_submit ("free",   1024 * swap_free,   DS_TYPE_GAUGE);
 	swap_submit ("cached", 1024 * swap_cached, DS_TYPE_GAUGE);
@@ -503,30 +490,8 @@ static int swap_read (void)
 	return (0);
 } /* int swap_read */
 
-static int swap_config (const char *key, const char *value)
-{
-	if (strcasecmp ("ReportBytes", key) == 0)
-	{
-#if KERNEL_LINUX
-		report_bytes = IS_TRUE (value) ? 1 : 0;
-#else
-		WARNING ("swap plugin: The \"ReportBytes\" option is only "
-				"valid under Linux. The option is going to "
-				"be ignored.");
-#endif
-	}
-	else
-	{
-		return (-1);
-	}
-
-	return (0);
-} /* int swap_config */
-
 void module_register (void)
 {
-	plugin_register_config ("swap", swap_config,
-			config_keys, config_keys_num);
 	plugin_register_init ("swap", swap_init);
 	plugin_register_read ("swap", swap_read);
 } /* void module_register */