X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmemory.c;h=5cb574dc9f18ef3c8dace1d9e90a6e0041c526ac;hb=2354eda94fa44c8bcb8e39b24b117e7937110224;hp=8830ffe60fc533717a69f44fd9148b0b7e729b9d;hpb=abf77d54fe3d48f848679a99dc3dbd75c6766a38;p=collectd.git

diff --git a/src/memory.c b/src/memory.c
index 8830ffe6..5cb574dc 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -43,17 +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
-
 /* 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 */
@@ -66,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 */
@@ -106,15 +103,16 @@ static void memory_submit (const char *type_instance, gauge_t value)
 	vl.time = time (NULL);
 	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "memory");
+	strcpy (vl.type, "memory");
 	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 	vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
 
-	plugin_dispatch_values ("memory", &vl);
+	plugin_dispatch_values (&vl);
 }
 
 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;
@@ -165,7 +163,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
 	/*
@@ -190,7 +188,6 @@ static int memory_read (void)
 	};
 	double sysctl_vals[8];
 
-	size_t len;
 	int    i;
 
 	for (i = 0; sysctl_keys[i] != NULL; i++)
@@ -306,7 +303,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)
@@ -322,12 +319,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 */