From: octo <octo>
Date: Thu, 15 Jun 2006 20:24:43 +0000 (+0000)
Subject: solaris-fixes branch: Applied the swap-patch by Christophe Kalt.
X-Git-Tag: collectd-3.9.4~11
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=ee1113650b0b565776fc3d62162d84741e234f05;p=collectd.git

solaris-fixes branch: Applied the swap-patch by Christophe Kalt.

It's supposed to fix the swap plugin under Solaris, but appears to have some
problems.
---

diff --git a/src/swap.c b/src/swap.c
index 08915032..86df6f75 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -145,43 +145,41 @@ static void swap_read (void)
 	unsigned long long swap_alloc;
 	unsigned long long swap_resv;
 	unsigned long long swap_avail;
-	/* unsigned long long swap_free; */
-
-	long long availrmem;
-	long long swapfs_minfree;
 
 	struct anoninfo ai;
 
 	if (swapctl (SC_AINFO, &ai) == -1)
 		return;
 
-	availrmem      = get_kstat_value (ksp, "availrmem");
-	swapfs_minfree = get_kstat_value (ksp, "minfree");
-
-	if ((availrmem < 0LL) || (swapfs_minfree < 0LL))
-		return;
-
-	/* 
-	 * Calculations learned by reading
-	 * http://www.itworld.com/Comp/2377/UIR980701perf/
+	/*
+	 * Calculations from:
+	 * http://cvs.opensolaris.org/source/xref/on/usr/src/cmd/swap/swap.c
+	 * Also see:
+	 * http://www.itworld.com/Comp/2377/UIR980701perf/ (outdated?)
+	 * /usr/include/vm/anon.h
 	 *
-	 * swap_resv += ani_resv
-	 * swap_alloc += MAX(ani_resv, ani_max) - ani_free
-	 * swap_avail += MAX(ani_max - ani_resv, 0) + (availrmem - swapfs_minfree)
-	 * swap_free += ani_free + (availrmem - swapfs_minfree)
+	 * In short, swap -s shows: allocated + reserved = used, available
 	 *
-	 * To clear up the terminology a bit:
-	 * resv  = reserved (but not neccessarily used)
-	 * alloc = used     (neccessarily reserved)
-	 * avail = not reserved  (neccessarily free)
-	 * free  = not allocates (possibly reserved)
+	 * However, Solaris does not allow to allocated/reserved more than the
+	 * available swap (physical memory + disk swap), so the pedant may
+	 * prefer: allocated + unallocated = reserved, available
+	 * 
+	 * We map the above to: used + resv = n/a, free
+	 *
+	 * Does your brain hurt yet?  - Christophe Kalt
+	 *
+	 * Oh, and in case you wonder,
+	 * swap_alloc = pagesize * ( ai.ani_max - ai.ani_free );
+	 * can suffer from a 32bit overflow.
 	 */
-	swap_resv  = pagesize * ai.ani_resv;
-	swap_alloc = pagesize * (MAX(ai.ani_resv, ai.ani_max) - ai.ani_free);
-	swap_avail = pagesize * (MAX(ai.ani_max - ai.ani_resv, 0) + (availrmem - swapfs_minfree));
-	/* swap_free  = pagesize * (ai.ani_free + (availrmem - swapfs_minfree)); */
-
-	swap_submit (swap_alloc, swap_avail, -1LL, swap_resv - swap_alloc);
+	swap_alloc  = ai.ani_max - ai.ani_free;
+	swap_alloc *= pagesize;
+	swap_resv   = ai.ani_resv + ai.ani_free - ai.ani_max;
+	swap_resv  *= pagesize;
+	swap_avail  = ai.ani_max - ai.ani_resv;
+	swap_avail *= pagesize;
+
+	swap_submit (swap_alloc, swap_avail, -1LL, swap_resv);
 /* #endif defined(KERNEL_SOLARIS) */
 
 #elif defined(HAVE_LIBSTATGRAB)