X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmemory.c;h=47b3cb31a77377aa31362cc4bce187905158eef1;hb=e4b274ed754af52196d3390b8ce101a7f94e318a;hp=e169503c6de742bd89c02c558881d7edbd17253a;hpb=c493010e9f1a6537dca21be2290bc28051ad0efc;p=collectd.git

diff --git a/src/memory.c b/src/memory.c
index e169503c..47b3cb31 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -43,12 +43,6 @@
 # include <mach/vm_statistics.h>
 #endif
 
-#if defined (HOST_VM_INFO) || HAVE_SYSCTLBYNAME || KERNEL_LINUX || HAVE_LIBKSTAT
-# define MEMORY_HAVE_READ 1
-#else
-# define MEMORY_HAVE_READ 0
-#endif
-
 /* vm_statistics_data_t */
 #if defined(HOST_VM_INFO)
 static mach_port_t port_host;
@@ -66,9 +60,12 @@ static vm_size_t pagesize;
 #elif HAVE_LIBKSTAT
 static int pagesize;
 static kstat_t *ksp;
-#endif /* HAVE_LIBKSTAT */
+/* #endif HAVE_LIBKSTAT */
+
+#else
+# error "No applicable input method."
+#endif
 
-#if MEMORY_HAVE_READ
 static int memory_init (void)
 {
 #if defined(HOST_VM_INFO)
@@ -102,7 +99,7 @@ static void memory_submit (const char *type_instance, gauge_t value)
 	values[0].gauge = value;
 
 	vl.values = values;
-	vl.values_len = 4;
+	vl.values_len = 1;
 	vl.time = time (NULL);
 	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "memory");
@@ -190,7 +187,6 @@ static int memory_read (void)
 	};
 	double sysctl_vals[8];
 
-	size_t len;
 	int    i;
 
 	for (i = 0; sysctl_keys[i] != NULL; i++)
@@ -216,10 +212,10 @@ static int memory_read (void)
 			sysctl_vals[i] *= sysctl_vals[0];
 
 	memory_submit ("free",     sysctl_vals[2]);
-	memory_submit ("wired",    sysctl_vals[2]);
-	memory_submit ("active",   sysctl_vals[2]);
-	memory_submit ("inactive", sysctl_vals[2]);
-	memory_submit ("cache",    sysctl_vals[2]);
+	memory_submit ("wired",    sysctl_vals[3]);
+	memory_submit ("active",   sysctl_vals[4]);
+	memory_submit ("inactive", sysctl_vals[5]);
+	memory_submit ("cache",    sysctl_vals[6]);
 /* #endif HAVE_SYSCTLBYNAME */
 
 #elif defined(KERNEL_LINUX)
@@ -276,10 +272,9 @@ static int memory_read (void)
 	{
 		mem_used -= mem_free + mem_buffered + mem_cached;
 		memory_submit ("used",     mem_used);
-		memory_submit ("buffered", mem_used);
-		memory_submit ("cached",   mem_used);
-		memory_submit ("free",     mem_used);
-
+		memory_submit ("buffered", mem_buffered);
+		memory_submit ("cached",   mem_cached);
+		memory_submit ("free",     mem_free);
 	}
 /* #endif defined(KERNEL_LINUX) */
 
@@ -307,7 +302,7 @@ static int memory_read (void)
 
 	memory_submit ("used",   mem_used);
 	memory_submit ("free",   mem_free);
-	memory_submit ("locked", mem_locked);
+	memory_submit ("locked", mem_lock);
 /* #endif defined(HAVE_LIBKSTAT) */
 
 #elif defined(HAVE_LIBSTATGRAB)
@@ -323,12 +318,9 @@ static int memory_read (void)
 
 	return (0);
 }
-#endif /* MEMORY_HAVE_READ */
 
 void module_register (void)
 {
-#if MEMORY_HAVE_READ
 	plugin_register_init ("memory", memory_init);
 	plugin_register_read ("memory", memory_read);
-#endif /* MEMORY_HAVE_READ */
 } /* void module_register */