Merge branch 'collectd-4.3' into collectd-4.4

[collectd.git] / src / memory.c

diff --git a/src/memory.c b/src/memory.c
index 47725a1..fe3a16e 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -43,10 +43,8 @@
 # include <mach/vm_statistics.h>
 #endif
 
-#if HAVE_HOST_STATISTICS || HAVE_SYSCTLBYNAME || KERNEL_LINUX || HAVE_LIBKSTAT
-# define MEMORY_HAVE_READ 1
-#else
-# define MEMORY_HAVE_READ 0
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
 #endif
 
 /* vm_statistics_data_t */
@@ -66,9 +64,16 @@ static vm_size_t pagesize;
 #elif HAVE_LIBKSTAT
 static int pagesize;
 static kstat_t *ksp;
-#endif /* HAVE_LIBKSTAT */
+/* #endif HAVE_LIBKSTAT */
+
+#elif HAVE_LIBSTATGRAB
+/* no global variables */
+/* endif HAVE_LIBSTATGRAB */
+
+#else
+# error "No applicable input method."
+#endif
 
-#if MEMORY_HAVE_READ
 static int memory_init (void)
 {
 #if HAVE_HOST_STATISTICS
@@ -221,7 +226,7 @@ static int memory_read (void)
        memory_submit ("cache",    sysctl_vals[6]);
 /* #endif HAVE_SYSCTLBYNAME */
 
-#elif defined(KERNEL_LINUX)
+#elif KERNEL_LINUX
        FILE *fh;
        char buffer[1024];
        
@@ -279,9 +284,9 @@ static int memory_read (void)
                memory_submit ("cached",   mem_cached);
                memory_submit ("free",     mem_free);
        }
-/* #endif defined(KERNEL_LINUX) */
+/* #endif KERNEL_LINUX */
 
-#elif defined(HAVE_LIBKSTAT)
+#elif HAVE_LIBKSTAT
        long long mem_used;
        long long mem_free;
        long long mem_lock;
@@ -306,9 +311,9 @@ static int memory_read (void)
        memory_submit ("used",   mem_used);
        memory_submit ("free",   mem_free);
        memory_submit ("locked", mem_lock);
-/* #endif defined(HAVE_LIBKSTAT) */
+/* #endif HAVE_LIBKSTAT */
 
-#elif defined(HAVE_LIBSTATGRAB)
+#elif HAVE_LIBSTATGRAB
        sg_mem_stats *ios;
 
        if ((ios = sg_get_mem_stats ()) != NULL)
@@ -321,12 +326,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 */