X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmemory.c;h=6ea6205e1ca51a72569bc352294e441cb3e6aed6;hb=322a56392b9ed2b99f28afbb5ca1d2f642e12786;hp=c31b30efe29b109cf3ae7c73055a48502c5b21fb;hpb=8a277e54b4ed7bccb4b3a2e7668792cd5303d3ac;p=collectd.git diff --git a/src/memory.c b/src/memory.c index c31b30ef..6ea6205e 100644 --- a/src/memory.c +++ b/src/memory.c @@ -1,6 +1,6 @@ /** * collectd - src/memory.c - * Copyright (C) 2005-2007 Florian octo Forster + * Copyright (C) 2005-2008 Florian octo Forster * * 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 @@ -92,8 +92,11 @@ static int memory_init (void) #elif defined(HAVE_LIBKSTAT) /* getpagesize(3C) tells me this does not fail.. */ pagesize = getpagesize (); - if (get_kstat (&ksp, "unix", 0, "system_pages")) + if (get_kstat (&ksp, "unix", 0, "system_pages") != 0) + { ksp = NULL; + return (-1); + } #endif /* HAVE_LIBKSTAT */ return (0); @@ -108,7 +111,6 @@ static void memory_submit (const char *type_instance, gauge_t value) vl.values = values; vl.values_len = 1; - vl.time = time (NULL); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "memory", sizeof (vl.plugin)); sstrncpy (vl.type, "memory", sizeof (vl.type)); @@ -206,7 +208,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 {