erlang plugin: Hint towards epmd if erl_publish fails.

[collectd.git] / src / memory.c

diff --git a/src/memory.c b/src/memory.c
index 0926c59..799a80c 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/memory.c
  * Copyright (C) 2005-2008  Florian octo Forster
+ * Copyright (C) 2009       Simon Kuhnle
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,6 +18,7 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Simon Kuhnle <simon at blarzwurst.de>
  **/
 
 #include "collectd.h"
@@ -53,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 */
@@ -70,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 */
@@ -85,10 +87,6 @@ static int memory_init (void)
        host_page_size (port_host, &pagesize);
 /* #endif HAVE_HOST_STATISTICS */
 
-#elif HAVE_SYSCTL
-       pagesize = getpagesize ();
-/* #endif HAVE_SYSCTL */
-
 #elif HAVE_SYSCTLBYNAME
 /* no init stuff */
 /* #endif HAVE_SYSCTLBYNAME */
@@ -105,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 */
@@ -182,32 +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;
-
-       if (pagesize <= 0)
-       {
-               ERROR ("memory plugin: Invalid pagesize: %i", pagesize);
-               return (-1);
-       }
-
-       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);
-       }
-
-       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
@@ -242,7 +227,7 @@ static int memory_read (void)
                                        NULL, 0) == 0)
                {
                        sysctl_vals[i] = value;
-                       DEBUG ("memory plugin: %26s: %6i", sysctl_keys[i], sysctl_vals[i]);
+                       DEBUG ("memory plugin: %26s: %g", sysctl_keys[i], sysctl_vals[i]);
                }
                else
                {
@@ -349,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;