Merge branch 'ff/apcups' into collectd-4.0

[collectd.git] / src / memory.c

diff --git a/src/memory.c b/src/memory.c
index aff16f5..cb7e688 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -102,7 +102,7 @@ static void memory_submit (const char *type_instance, gauge_t value)
        values[0].gauge = value;
 
        vl.values = values;
-       vl.values_len = 4;
+       vl.values_len = 1;
        vl.time = time (NULL);
        strcpy (vl.host, hostname_g);
        strcpy (vl.plugin, "memory");
@@ -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++)
@@ -276,10 +275,9 @@ static int memory_read (void)
        {
                mem_used -= mem_free + mem_buffered + mem_cached;
                memory_submit ("used",     mem_used);
-               memory_submit ("buffered", mem_used);
-               memory_submit ("cached",   mem_used);
-               memory_submit ("free",     mem_used);
-
+               memory_submit ("buffered", mem_buffered);
+               memory_submit ("cached",   mem_cached);
+               memory_submit ("free",     mem_free);
        }
 /* #endif defined(KERNEL_LINUX) */
 
@@ -307,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)