memory plugin: Fix the order of the #ifdef's.

Linux has sysctl too. I'm using the same order as in the CPU plugin here,
i. e.:
 * Linux
 * kstat
 * sysctl

diff --git a/src/memory.c b/src/memory.c
index 3b9796aea92aff1e189ce44a4921292cbfacf1aa..6f0e466570e482a556f432c405cc6305c9d1f42d 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -55,10 +55,6 @@ static mach_port_t port_host;
 static vm_size_t pagesize;
 /* #endif HAVE_HOST_STATISTICS */
 
-#elif HAVE_SYSCTL
-static int pagesize;
-/* #endif HAVE_SYSCTL */
-
 #elif HAVE_SYSCTLBYNAME
 /* no global variables */
 /* #endif HAVE_SYSCTLBYNAME */
@@ -72,6 +68,10 @@ static int pagesize;
 static kstat_t *ksp;
 /* #endif HAVE_LIBKSTAT */
 
+#elif HAVE_SYSCTL
+static int pagesize;
+/* #endif HAVE_SYSCTL */
+
 #elif HAVE_LIBSTATGRAB
 /* no global variables */
 /* endif HAVE_LIBSTATGRAB */
@@ -87,15 +87,6 @@ static int memory_init (void)
        host_page_size (port_host, &pagesize);
 /* #endif HAVE_HOST_STATISTICS */
 
-#elif HAVE_SYSCTL
-       pagesize = getpagesize ();
-       if (pagesize <= 0)
-       {
-               ERROR ("memory plugin: Invalid pagesize: %i", pagesize);
-               return (-1);
-       }
-/* #endif HAVE_SYSCTL */
-
 #elif HAVE_SYSCTLBYNAME
 /* no init stuff */
 /* #endif HAVE_SYSCTLBYNAME */
@@ -112,7 +103,20 @@ static int memory_init (void)
                ksp = NULL;
                return (-1);
        }
-#endif /* HAVE_LIBKSTAT */
+/* #endif HAVE_LIBKSTAT */
+
+#elif HAVE_SYSCTL
+       pagesize = getpagesize ();
+       if (pagesize <= 0)
+       {
+               ERROR ("memory plugin: Invalid pagesize: %i", pagesize);
+               return (-1);
+       }
+/* #endif HAVE_SYSCTL */
+
+#elif HAVE_LIBSTATGRAB
+/* no init stuff */
+#endif /* HAVE_LIBSTATGRAB */
 
        return (0);
 } /* int memory_init */
@@ -189,27 +193,6 @@ static int memory_read (void)
        memory_submit ("free",     free);
 /* #endif HAVE_HOST_STATISTICS */
 
-#elif HAVE_SYSCTL
-       int mib[] = {CTL_VM, VM_METER};
-       struct vmtotal vmtotal;
-       size_t size;
-
-       memset (&vmtotal, 0, sizeof (vmtotal));
-       size = sizeof (vmtotal);
-
-       if (sysctl (mib, 2, &vmtotal, &size, NULL, 0) < 0) {
-               char errbuf[1024];
-               WARNING ("memory plugin: sysctl failed: %s",
-                       sstrerror (errno, errbuf, sizeof (errbuf)));
-               return (-1);
-       }
-
-       assert (pagesize > 0);
-       memory_submit ("active",   vmtotal.t_arm * pagesize);
-       memory_submit ("inactive", (vmtotal.t_rm - vmtotal.t_arm) * pagesize);
-       memory_submit ("free",     vmtotal.t_free * pagesize);
-/* #endif HAVE_SYSCTL */
-
 #elif HAVE_SYSCTLBYNAME
        /*
         * vm.stats.vm.v_page_size: 4096
@@ -351,6 +334,27 @@ static int memory_read (void)
        memory_submit ("locked", mem_lock);
 /* #endif HAVE_LIBKSTAT */
 
+#elif HAVE_SYSCTL
+       int mib[] = {CTL_VM, VM_METER};
+       struct vmtotal vmtotal;
+       size_t size;
+
+       memset (&vmtotal, 0, sizeof (vmtotal));
+       size = sizeof (vmtotal);
+
+       if (sysctl (mib, 2, &vmtotal, &size, NULL, 0) < 0) {
+               char errbuf[1024];
+               WARNING ("memory plugin: sysctl failed: %s",
+                       sstrerror (errno, errbuf, sizeof (errbuf)));
+               return (-1);
+       }
+
+       assert (pagesize > 0);
+       memory_submit ("active",   vmtotal.t_arm * pagesize);
+       memory_submit ("inactive", (vmtotal.t_rm - vmtotal.t_arm) * pagesize);
+       memory_submit ("free",     vmtotal.t_free * pagesize);
+/* #endif HAVE_SYSCTL */
+
 #elif HAVE_LIBSTATGRAB
        sg_mem_stats *ios;