[hackers] [slstatus][patch] corrected calculation for swap on openbsd

From: Tobias Tschinkowitz <he4d_AT_posteo.de>
Date: Wed, 16 May 2018 13:26:34 +0200

Hi again!

The swapctl(2) function fills the swapent struct with 512KB blocks.
As we want to display in GB, i just modified the calculation for this to
get the expected output.

Greetings,
Tobias

---
 components/swap.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git components/swap.c components/swap.c
index 031b713..caa4788 100644
--- components/swap.c
+++ components/swap.c
_AT_@ -131,8 +131,6 @@
 	#include <sys/types.h>
 	#include <unistd.h>
 
-	#define	dbtoqb(b) dbtob((int64_t)(b))
-
 	static void
 	getstats(int *total, int *used)
 	{
_AT_@ -162,8 +160,8 @@
 		*used = 0;
 
 		for (i = 0; i < rnswap; i++) {
-			*total += dbtoqb(sep->se_nblks);
-			*used += dbtoqb(sep->se_inuse);
+			*total += sep->se_nblks >> 1;
+			*used += sep->se_inuse >> 1;
 		}
 
 		free(fsep);
_AT_@ -176,7 +174,7 @@
 
 		getstats(&total, &used);
 
-		return bprintf("%f", (float)(total - used) / 1024 / 1024 / 1024);
+		return bprintf("%f", (float)(total - used) / 1024 / 1024);
 	}
 
 	const char *
_AT_@ -196,7 +194,7 @@
 
 		getstats(&total, &used);
 
-		return bprintf("%f", (float)total / 1024 / 1024 / 1024);
+		return bprintf("%f", (float)total / 1024 / 1024);
 	}
 
 	const char *
_AT_@ -206,6 +204,6 @@
 
 		getstats(&total, &used);
 
-		return bprintf("%f", (float)used / 1024 / 1024 / 1024);
+		return bprintf("%f", (float)used / 1024 / 1024);
 	}
 #endif
-- 
2.16.2

Received on Wed May 16 2018 - 13:26:34 CEST