From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 6 Oct 2010 12:32:56 +0000 (+0200)
Subject: lpar plugin: Calculate "pool busy" from "pool idle", not the other way around.
X-Git-Tag: collectd-5.0.0-beta0~27^2~3
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=89578615b8f268f2150f786567eb433b6fcbc7e4

lpar plugin: Calculate "pool busy" from "pool idle", not the other way around.
---

diff --git a/src/lpar.c b/src/lpar.c
index ec39d5c0..146aaf2f 100644
--- a/src/lpar.c
+++ b/src/lpar.c
@@ -230,21 +230,25 @@ static int lpar_read (void)
 	if (pool_stats)
 	{
 		char typinst[DATA_MAX_NAME_LEN];
-		u_longlong_t pool_busy_ns;
-	       	u_longlong_t pool_max_ns;
-		u_longlong_t pool_idle_ns = 0;
+		u_longlong_t pool_idle_ns;
+		double pool_idle_cpus;
+		double pool_busy_cpus;
+
+		/* We're calculating "busy" from "idle" and the total number of
+		 * CPUs, because according to Aurélien Reynaud using the "busy"
+		 * member yields values that differ from the values produced by
+		 * the LPAR command line tools. --octo */
+		pool_idle_ns = lparstats.pool_idle_time - lparstats_old.pool_idle_time;
+		pool_idle_cpus = NS_TO_TICKS ((double) pool_idle_ns) / (double) ticks;
+		pool_busy_cpus = ((double) lparstats.phys_cpus_pool) - pool_idle_cpus;
+		if (pool_busy_cpus < 0.0)
+			pool_busy_cpus = 0.0;
 
-		pool_busy_ns = lparstats.pool_busy_time - lparstats_old.pool_busy_time;
-		pool_max_ns  = lparstats.pool_max_time  - lparstats_old.pool_max_time;
-		if (pool_max_ns > pool_busy_ns)
-			pool_idle_ns = pool_max_ns - pool_busy_ns;
-
-		/* Pool stats are in CPU x ns */
 		ssnprintf (typinst, sizeof (typinst), "pool-%X-busy", lparstats.pool_id);
-		lpar_submit (typinst, NS_TO_TICKS ((double) pool_busy_ns) / (double) ticks);
+		lpar_submit (typinst, pool_busy_cpus);
 
 		ssnprintf (typinst, sizeof (typinst), "pool-%X-idle", lparstats.pool_id);
-		lpar_submit (typinst, NS_TO_TICKS ((double) pool_idle_ns) / (double) ticks);
+		lpar_submit (typinst, pool_idle_cpus);
 	}
 
 	memcpy (&lparstats_old, &lparstats, sizeof (lparstats_old));