src/liboconfig: Imported liboconfig 0.1.2.

[collectd.git] / src / memory.c

diff --git a/src/memory.c b/src/memory.c
index 38a6dc2d3474d4d1d8924be78f1cd1bea95b44ce..21877205467441fef10cb673125cc21d6aa9ae5a 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -22,7 +22,6 @@
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
-#include "utils_debug.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
 # include <sys/sysctl.h>
@@ -149,7 +148,7 @@ static int memory_read (void)
                                        (host_info_t) &vm_data,
                                        &vm_data_len)) != KERN_SUCCESS)
        {
-               syslog (LOG_ERR, "memory-plugin: host_statistics failed and returned the value %i", (int) status);
+               ERROR ("memory-plugin: host_statistics failed and returned the value %i", (int) status);
                return (-1);
        }
 
@@ -215,11 +214,14 @@ static int memory_read (void)
                                                (void *) &sysctl_vals[i], &len,
                                                NULL, 0)) < 0)
                {
-                       syslog (LOG_ERR, "memory plugin: sysctlbyname (%s): %s",
-                                       sysctl_keys[i], strerror (errno));
+                       char errbuf[1024];
+                       ERROR ("memory plugin: sysctlbyname (%s): %s",
+                                       sysctl_keys[i],
+                                       sstrerror (errno, errbuf,
+                                               sizeof (errbuf)));
                        return (-1);
                }
-               DBG ("%26s: %6i", sysctl_keys[i], sysctl_vals[i]);
+               DEBUG ("%26s: %6i", sysctl_keys[i], sysctl_vals[i]);
        } /* for i */
 
        /* multiply all all page counts with the pagesize */
@@ -246,7 +248,9 @@ static int memory_read (void)
 
        if ((fh = fopen ("/proc/meminfo", "r")) == NULL)
        {
-               syslog (LOG_WARNING, "memory: fopen: %s", strerror (errno));
+               char errbuf[1024];
+               WARNING ("memory: fopen: %s",
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
                return (-1);
        }
 
@@ -274,7 +278,11 @@ static int memory_read (void)
        }
 
        if (fclose (fh))
-               syslog (LOG_WARNING, "memory: fclose: %s", strerror (errno));
+       {
+               char errbuf[1024];
+               WARNING ("memory: fclose: %s",
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
+       }
 
        if (mem_used >= (mem_free + mem_buffered + mem_cached))
        {
@@ -319,12 +327,16 @@ static int memory_read (void)
 }
 #endif /* MEMORY_HAVE_READ */
 
-void module_register (void)
+void module_register (modreg_e load)
 {
-       plugin_register_data_set (&ds);
+       if (load & MR_DATASETS)
+               plugin_register_data_set (&ds);
 
 #if MEMORY_HAVE_READ
-       plugin_register_init ("memory", memory_init);
-       plugin_register_read ("memory", memory_read);
+       if (load & MR_READ)
+       {
+               plugin_register_init ("memory", memory_init);
+               plugin_register_read ("memory", memory_read);
+       }
 #endif /* MEMORY_HAVE_READ */
-}
+} /* void module_register */