X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/0f9a1a836720c028d89891b85ec8b1dbbd12c485..c12b9cc50b5f476cd7b1de1dbd49e6282b1a042f:/components/ram.c

diff --git a/components/ram.c b/components/ram.c
index 1178837..7c0870c 100644
--- a/components/ram.c
+++ b/components/ram.c
@@ -9,8 +9,15 @@
 	{
 		long free;
 
-		return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
-		       bprintf("%f", (float)free / 1024 / 1024) : NULL;
+		if (pscanf("/proc/meminfo",
+		           "MemTotal: %ld kB\n"
+		           "MemFree: %ld kB\n"
+		           "MemAvailable: %ld kB\n",
+		           &free, &free, &free) != 3) {
+			return NULL;
+		}
+
+		return fmt_human_2(free * 1024, "B");
 	}
 
 	const char *
@@ -18,15 +25,17 @@
 	{
 		long total, free, buffers, cached;
 
-		return (pscanf("/proc/meminfo",
-		               "MemTotal: %ld kB\n"
-		               "MemFree: %ld kB\n"
-		               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-		               "Cached: %ld kB\n",
-		               &total, &free, &buffers, &buffers, &cached) == 5) ?
-		       bprintf("%d", 100 * ((total - free) - (buffers + cached)) /
-		               total) :
-		       NULL;
+		if (pscanf("/proc/meminfo",
+		           "MemTotal: %ld kB\n"
+		           "MemFree: %ld kB\n"
+		           "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+		           "Cached: %ld kB\n",
+		           &total, &free, &buffers, &buffers, &cached) != 5) {
+			return NULL;
+		}
+
+		return bprintf("%d%%", 100 * ((total - free) -
+		                              (buffers + cached)) / total);
 	}
 
 	const char *
@@ -34,8 +43,12 @@
 	{
 		long total;
 
-		return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
-		       bprintf("%f", (float)total / 1024 / 1024) : NULL;
+		if (pscanf("/proc/meminfo", "MemTotal: %ld kB\n",
+		           &total) != 1) {
+			return NULL;
+		}
+
+		return fmt_human_2(total * 1024, "B");
 	}
 
 	const char *
@@ -43,15 +56,17 @@
 	{
 		long total, free, buffers, cached;
 
-		return (pscanf("/proc/meminfo",
-		               "MemTotal: %ld kB\n"
-		               "MemFree: %ld kB\n"
-		               "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;
+		if (pscanf("/proc/meminfo",
+		           "MemTotal: %ld kB\n"
+		           "MemFree: %ld kB\n"
+		           "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+		           "Cached: %ld kB\n",
+		           &total, &free, &buffers, &buffers, &cached) != 5) {
+			return NULL;
+		}
+
+		return fmt_human_2((total - free - buffers - cached) * 1024,
+		                   "B");
 	}
 #elif defined(__OpenBSD__)
 	#include <stdlib.h>
@@ -60,6 +75,7 @@
 	#include <unistd.h>
 
 	#define LOG1024 	10
+	#define pagetok(size, pageshift) ((size) << (pageshift - LOG1024))
 
 	inline int
 	load_uvmexp(struct uvmexp *uvmexp)
@@ -76,13 +92,11 @@
 	ram_free(void)
 	{
 		struct uvmexp uvmexp;
-		float free;
 		int free_pages;
 
 		if (load_uvmexp(&uvmexp)) {
 			free_pages = uvmexp.npages - uvmexp.active;
-			free = (float)(free_pages << (uvmexp.pageshift - LOG1024)) / 1024 / 1024; 
-			return bprintf("%f", free);
+			return fmt_human_2(pagetok(free_pages, uvmexp.pageshift) * 1024, "B");
 		}
 
 		return NULL;
@@ -96,7 +110,7 @@
 
 		if (load_uvmexp(&uvmexp)) {
 			percent = uvmexp.active * 100 / uvmexp.npages;
-			return bprintf("%d", percent);
+			return bprintf("%d%%", percent);
 		}
 
 		return NULL;
@@ -106,11 +120,9 @@
 	ram_total(void)
 	{
 		struct uvmexp uvmexp;
-		float total;
 
 		if (load_uvmexp(&uvmexp)) {
-			total = (float)(uvmexp.npages << (uvmexp.pageshift - LOG1024)) / 1024 / 1024; 
-			return bprintf("%f", total);
+			return fmt_human_2(pagetok(uvmexp.npages, uvmexp.pageshift) * 1024, "B");
 		}
 
 		return NULL;
@@ -120,12 +132,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_human_2(pagetok(uvmexp.active, uvmexp.pageshift) * 1024, "B");
 		}
 
 		return NULL;