X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/9750a3d731cd381e832bcacf1d03e48ddb46cc16..74c4f4ebdae8a12fc95840954dde574692234b01:/components/ram.c?ds=sidebyside

diff --git a/components/ram.c b/components/ram.c
index 5611022..0eb2ea9 100644
--- a/components/ram.c
+++ b/components/ram.c
@@ -9,8 +9,12 @@
 	{
 		long free;
 
-		return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
-		       bprintf("%f", (float)free / 1024 / 1024) : NULL;
+		return (pscanf("/proc/meminfo",
+		               "MemTotal: %ld kB\n"
+		               "MemFree: %ld kB\n"
+		               "MemAvailable: %ld kB\n",
+		               &free, &free, &free) == 3) ?
+		       fmt_scaled(free * 1024) : NULL;
 	}
 
 	const char *
@@ -24,7 +28,7 @@
 		               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
 		               "Cached: %ld kB\n",
 		               &total, &free, &buffers, &buffers, &cached) == 5) ?
-		       bprintf("%d", 100 * ((total - free) - (buffers + cached)) /
+		       bprintf("%d%%", 100 * ((total - free) - (buffers + cached)) /
 		               total) :
 		       NULL;
 	}
@@ -35,7 +39,7 @@
 		long total;
 
 		return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
-		       bprintf("%f", (float)total / 1024 / 1024) : NULL;
+		       fmt_scaled(total * 1024) : NULL;
 	}
 
 	const char *
@@ -49,16 +53,17 @@
 		               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
 		               "Cached: %ld kB\n",
 		               &total, &free, &buffers, &buffers, &cached) == 5) ?
-		       bprintf("%f", (float)(total - free - buffers - cached) /
-		               1024 / 1024) :
-		       NULL;
+		       fmt_scaled((total - free - buffers - cached) * 1024) : NULL;
 	}
 #elif defined(__OpenBSD__)
-	#include <sys/types.h>
-	#include <sys/sysctl.h>
 	#include <stdlib.h>
+	#include <sys/sysctl.h>
+	#include <sys/types.h>
 	#include <unistd.h>
 
+	#define LOG1024 	10
+	#define pagetok(size, pageshift) ((size) << (pageshift - LOG1024))
+
 	inline int
 	load_uvmexp(struct uvmexp *uvmexp)
 	{
@@ -74,14 +79,11 @@
 	ram_free(void)
 	{
 		struct uvmexp uvmexp;
-		float free;
 		int free_pages;
 
 		if (load_uvmexp(&uvmexp)) {
 			free_pages = uvmexp.npages - uvmexp.active;
-			free = (double) (free_pages * uvmexp.pagesize) / 1024 /
-			       1024 / 1024;
-			return bprintf("%f", free);
+			return fmt_scaled(pagetok(free_pages, uvmexp.pageshift) * 1024);
 		}
 
 		return NULL;
@@ -95,7 +97,7 @@
 
 		if (load_uvmexp(&uvmexp)) {
 			percent = uvmexp.active * 100 / uvmexp.npages;
-			return bprintf("%d", percent);
+			return bprintf("%d%%", percent);
 		}
 
 		return NULL;
@@ -105,12 +107,9 @@
 	ram_total(void)
 	{
 		struct uvmexp uvmexp;
-		float total;
 
 		if (load_uvmexp(&uvmexp)) {
-			total = (double) (uvmexp.npages * uvmexp.pagesize) /
-			        1024 / 1024 / 1024;
-			return bprintf("%f", total);
+			return fmt_scaled(pagetok(uvmexp.npages, uvmexp.pageshift) * 1024);
 		}
 
 		return NULL;
@@ -120,12 +119,9 @@
 	ram_used(void)
 	{
 		struct uvmexp uvmexp;
-		float used;
 
 		if (load_uvmexp(&uvmexp)) {
-			used = (double) (uvmexp.active * uvmexp.pagesize) /
-			       1024 / 1024 / 1024;
-			return bprintf("%f", used);
+			return fmt_scaled(pagetok(uvmexp.active, uvmexp.pageshift) * 1024);
 		}
 
 		return NULL;