X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmemory.c;h=6a50161017bf22e7d384bc597589ad48f97a1e4e;hb=c6da31fb30c2fb1d131f92efcde0b3ec9a010b2c;hp=b79a74b7cb42a307916eef911dbba3a968ac456a;hpb=9622e4d30f90e9eefca1d43fefc6bf85785074d3;p=collectd.git

diff --git a/src/memory.c b/src/memory.c
index b79a74b7..6a501610 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -321,9 +321,17 @@ static int memory_read (void)
 /* #endif KERNEL_LINUX */
 
 #elif HAVE_LIBKSTAT
+        /* Most of the additions here were taken as-is from the k9toolkit from
+         * Brendan Gregg and are subject to change I guess */
 	long long mem_used;
 	long long mem_free;
 	long long mem_lock;
+	long long mem_kern;
+	long long mem_unus;
+
+	long long pp_kernel;
+	long long physmem;
+	long long availrmem;
 
 	if (ksp == NULL)
 		return (-1);
@@ -331,20 +339,61 @@ static int memory_read (void)
 	mem_used = get_kstat_value (ksp, "pagestotal");
 	mem_free = get_kstat_value (ksp, "pagesfree");
 	mem_lock = get_kstat_value (ksp, "pageslocked");
+	mem_kern = 0;
+	mem_unus = 0;
+
+	pp_kernel = get_kstat_value (ksp, "pp_kernel");
+	physmem = get_kstat_value (ksp, "physmem");
+	availrmem = get_kstat_value (ksp, "availrmem");
 
 	if ((mem_used < 0LL) || (mem_free < 0LL) || (mem_lock < 0LL))
+	{
+		WARNING ("memory plugin: one of used, free or locked is negative.");
 		return (-1);
+	}
+
+	mem_unus = physmem - mem_used;
+
 	if (mem_used < (mem_free + mem_lock))
-		return (-1);
+	{
+		/* source: http://wesunsolve.net/bugid/id/4909199
+		 * this seems to happen when swap space is small, e.g. 2G on a 32G system
+		 * we will make some assumptions here
+		 * educated solaris internals help welcome here */
+		DEBUG ("memory plugin: pages total is smaller than \"free\" "
+				"+ \"locked\". This is probably due to small "
+				"swap space");
+		mem_free = availrmem;
+		mem_used = 0;
+	}
+	else
+	{
+		mem_used -= mem_free + mem_lock;
+	}
+
+	/* mem_kern is accounted for in mem_lock */
+	if ( pp_kernel < mem_lock )
+	{
+		mem_kern = pp_kernel;
+		mem_lock -= pp_kernel;
+	}
+	else
+	{
+		mem_kern = mem_lock;
+		mem_lock = 0;
+	}
 
-	mem_used -= mem_free + mem_lock;
 	mem_used *= pagesize; /* If this overflows you have some serious */
 	mem_free *= pagesize; /* memory.. Why not call me up and give me */
 	mem_lock *= pagesize; /* some? ;) */
+	mem_kern *= pagesize; /* it's 2011 RAM is cheap */
+	mem_unus *= pagesize;
 
 	memory_submit ("used",   mem_used);
 	memory_submit ("free",   mem_free);
 	memory_submit ("locked", mem_lock);
+	memory_submit ("kernel", mem_kern);
+	memory_submit ("unusable", mem_unus);
 /* #endif HAVE_LIBKSTAT */
 
 #elif HAVE_SYSCTL