X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmemory.c;h=3fbd33fb0c1da1a90cb666e1e6df044a711a2f64;hb=89783745dc59079eab34e0c52de6e5e972f50eb2;hp=9f954a4c0d661044ef0b0bd3735fc67be386cf63;hpb=f3ba9d619b0b7db3a44624c8ad639fa81ab583e1;p=collectd.git

diff --git a/src/memory.c b/src/memory.c
index 9f954a4c..3fbd33fb 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -43,28 +43,11 @@
 # 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
-
-/* 2^48 = 281474976710656 */
-static data_source_t dsrc[4] =
-{
-	{"value",  DS_TYPE_GAUGE, 0, 281474976710656.0}
-};
-
-static data_set_t ds =
-{
-	"memory", 1, dsrc
-};
-
 /* vm_statistics_data_t */
-#if defined(HOST_VM_INFO)
+#if HAVE_HOST_STATISTICS
 static mach_port_t port_host;
 static vm_size_t pagesize;
-/* #endif HOST_VM_INFO */
+/* #endif HAVE_HOST_STATISTICS */
 
 #elif HAVE_SYSCTLBYNAME
 /* no global variables */
@@ -77,15 +60,18 @@ 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)
+#if HAVE_HOST_STATISTICS
 	port_host = mach_host_self ();
 	host_page_size (port_host, &pagesize);
-/* #endif HOST_VM_INFO */
+/* #endif HAVE_HOST_STATISTICS */
 
 #elif HAVE_SYSCTLBYNAME
 /* no init stuff */
@@ -113,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");
@@ -125,7 +111,7 @@ static void memory_submit (const char *type_instance, gauge_t value)
 
 static int memory_read (void)
 {
-#if defined(HOST_VM_INFO)
+#if HAVE_HOST_STATISTICS
 	kern_return_t status;
 	vm_statistics_data_t   vm_data;
 	mach_msg_type_number_t vm_data_len;
@@ -176,7 +162,7 @@ static int memory_read (void)
 	memory_submit ("active",   active);
 	memory_submit ("inactive", inactive);
 	memory_submit ("free",     free);
-/* #endif HOST_VM_INFO */
+/* #endif HAVE_HOST_STATISTICS */
 
 #elif HAVE_SYSCTLBYNAME
 	/*
@@ -201,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++)
@@ -227,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)
@@ -287,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) */
 
@@ -318,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)
@@ -334,18 +318,9 @@ static int memory_read (void)
 
 	return (0);
 }
-#endif /* MEMORY_HAVE_READ */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-	if (load & MR_DATASETS)
-		plugin_register_data_set (&ds);
-
-#if MEMORY_HAVE_READ
-	if (load & MR_READ)
-	{
-		plugin_register_init ("memory", memory_init);
-		plugin_register_read ("memory", memory_read);
-	}
-#endif /* MEMORY_HAVE_READ */
+	plugin_register_init ("memory", memory_init);
+	plugin_register_read ("memory", memory_read);
 } /* void module_register */