X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmemory.c;h=2d90de3c78888210611780338622bb9a3e2b5396;hb=9b626288aff81c68fe19210a58b4a32eeefde9d3;hp=47725a1c05bd3d09b2b9f381ea4d8f455f408ad9;hpb=e2df20972ce0692d20479caea66b894edb5cc1b7;p=collectd.git

diff --git a/src/memory.c b/src/memory.c
index 47725a1c..2d90de3c 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
@@ -43,10 +43,8 @@
 # include <mach/vm_statistics.h>
 #endif
 
-#if HAVE_HOST_STATISTICS || HAVE_SYSCTLBYNAME || KERNEL_LINUX || HAVE_LIBKSTAT
-# define MEMORY_HAVE_READ 1
-#else
-# define MEMORY_HAVE_READ 0
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
 #endif
 
 /* vm_statistics_data_t */
@@ -66,9 +64,16 @@ static vm_size_t pagesize;
 #elif HAVE_LIBKSTAT
 static int pagesize;
 static kstat_t *ksp;
-#endif /* HAVE_LIBKSTAT */
+/* #endif HAVE_LIBKSTAT */
+
+#elif HAVE_LIBSTATGRAB
+/* no global variables */
+/* endif HAVE_LIBSTATGRAB */
+
+#else
+# error "No applicable input method."
+#endif
 
-#if MEMORY_HAVE_READ
 static int memory_init (void)
 {
 #if HAVE_HOST_STATISTICS
@@ -87,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);
@@ -103,13 +111,12 @@ static void memory_submit (const char *type_instance, gauge_t value)
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "memory");
-	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
-	vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "memory", sizeof (vl.plugin));
+	sstrncpy (vl.type, "memory", sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-	plugin_dispatch_values ("memory", &vl);
+	plugin_dispatch_values (&vl);
 }
 
 static int memory_read (void)
@@ -221,7 +228,7 @@ static int memory_read (void)
 	memory_submit ("cache",    sysctl_vals[6]);
 /* #endif HAVE_SYSCTLBYNAME */
 
-#elif defined(KERNEL_LINUX)
+#elif KERNEL_LINUX
 	FILE *fh;
 	char buffer[1024];
 	
@@ -279,9 +286,9 @@ static int memory_read (void)
 		memory_submit ("cached",   mem_cached);
 		memory_submit ("free",     mem_free);
 	}
-/* #endif defined(KERNEL_LINUX) */
+/* #endif KERNEL_LINUX */
 
-#elif defined(HAVE_LIBKSTAT)
+#elif HAVE_LIBKSTAT
 	long long mem_used;
 	long long mem_free;
 	long long mem_lock;
@@ -306,27 +313,24 @@ static int memory_read (void)
 	memory_submit ("used",   mem_used);
 	memory_submit ("free",   mem_free);
 	memory_submit ("locked", mem_lock);
-/* #endif defined(HAVE_LIBKSTAT) */
+/* #endif HAVE_LIBKSTAT */
 
-#elif defined(HAVE_LIBSTATGRAB)
+#elif HAVE_LIBSTATGRAB
 	sg_mem_stats *ios;
 
 	if ((ios = sg_get_mem_stats ()) != NULL)
 	{
 		memory_submit ("used",   ios->used);
-		memory_submit ("cached", ios->cached);
+		memory_submit ("cached", ios->cache);
 		memory_submit ("free",   ios->free);
 	}
 #endif /* HAVE_LIBSTATGRAB */
 
 	return (0);
 }
-#endif /* MEMORY_HAVE_READ */
 
 void module_register (void)
 {
-#if MEMORY_HAVE_READ
 	plugin_register_init ("memory", memory_init);
 	plugin_register_read ("memory", memory_read);
-#endif /* MEMORY_HAVE_READ */
 } /* void module_register */