X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmemory.c;h=3b9796aea92aff1e189ce44a4921292cbfacf1aa;hb=c05e0084f62cbdbfb558a7333784d5181dd2cef1;hp=63c3e6ac12c5bfa63d5078ff9f0527c25b173974;hpb=20f9591f4a37e0cf9bd7f8d9206c4c51a0617a63;p=collectd.git

diff --git a/src/memory.c b/src/memory.c
index 63c3e6ac..3b9796ae 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/memory.c
- * Copyright (C) 2005-2007  Florian octo Forster
+ * 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,6 +55,10 @@ 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 */
@@ -81,6 +87,15 @@ static int memory_init (void)
 	host_page_size (port_host, &pagesize);
 /* #endif HAVE_HOST_STATISTICS */
 
+#elif HAVE_SYSCTL
+	pagesize = getpagesize ();
+	if (pagesize <= 0)
+	{
+		ERROR ("memory plugin: Invalid pagesize: %i", pagesize);
+		return (-1);
+	}
+/* #endif HAVE_SYSCTL */
+
 #elif HAVE_SYSCTLBYNAME
 /* no init stuff */
 /* #endif HAVE_SYSCTLBYNAME */
@@ -111,7 +126,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));
@@ -175,6 +189,27 @@ 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;
+
+	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_SYSCTLBYNAME
 	/*
 	 * vm.stats.vm.v_page_size: 4096