memory plugin: Check for `HAVE_HOST_STATISTICS' rather than `HOST_VM_INFO'.

[collectd.git] / src / memory.c

diff --git a/src/memory.c b/src/memory.c
index 8830ffe..47725a1 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -43,17 +43,17 @@
 # include <mach/vm_statistics.h>
 #endif
 
-#if defined (HOST_VM_INFO) || HAVE_SYSCTLBYNAME || KERNEL_LINUX || HAVE_LIBKSTAT
+#if HAVE_HOST_STATISTICS || 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 */
@@ -71,10 +71,10 @@ static kstat_t *ksp;
 #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 */
@@ -114,7 +114,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;
@@ -165,7 +165,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 +190,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 +305,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)