X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/88bf05e4a3bc41392a4e25507bc79766de91c475..fa7c266e2b7adbc2a87bd44057b9e561d9ed61e3:/components/ram.c

diff --git a/components/ram.c b/components/ram.c
index b200882..74bf337 100644
--- a/components/ram.c
+++ b/components/ram.c
@@ -4,125 +4,150 @@
 #include "../util.h"
 
 #if defined(__linux__)
-const char *
-ram_free(void)
-{
-	long free;
-
-	return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
-	       bprintf("%f", (float)free / 1024 / 1024) : NULL;
-}
-
-const char *
-ram_perc(void)
-{
-	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;
-}
-
-const char *
-ram_total(void)
-{
-	long total;
-
-	return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
-	       bprintf("%f", (float)total / 1024 / 1024) : NULL;
-}
-
-const char *
-ram_used(void)
-{
-	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;
-}
+	#include <inttypes.h>
+
+	const char *
+	ram_free(void)
+	{
+		uint64_t free;
+
+		if (pscanf("/proc/meminfo",
+		           "MemTotal: %" PRIu64 " kB\n"
+		           "MemFree: %" PRIu64 " kB\n"
+		           "MemAvailable: %" PRIu64 " kB\n",
+		           &free, &free, &free) != 3) {
+			return NULL;
+		}
+
+		return fmt_human(free * 1024, 1024);
+	}
+
+	const char *
+	ram_perc(void)
+	{
+		uint64_t total, free, buffers, cached;
+
+		if (pscanf("/proc/meminfo",
+		           "MemTotal: %" PRIu64 " kB\n"
+		           "MemFree: %" PRIu64 " kB\n"
+		           "MemAvailable: %" PRIu64 " kB\nBuffers: %ld kB\n"
+		           "Cached: %" PRIu64 " kB\n",
+		           &total, &free, &buffers, &buffers, &cached) != 5) {
+			return NULL;
+		}
+
+		return bprintf("%d", 100 * ((total - free) -
+		                            (buffers + cached)) / total);
+	}
+
+	const char *
+	ram_total(void)
+	{
+		uint64_t total;
+
+		if (pscanf("/proc/meminfo", "MemTotal: %" PRIu64 " kB\n",
+		           &total) != 1) {
+			return NULL;
+		}
+
+		return fmt_human(total * 1024, 1024);
+	}
+
+	const char *
+	ram_used(void)
+	{
+		uint64_t total, free, buffers, cached;
+
+		if (pscanf("/proc/meminfo",
+		           "MemTotal: %" PRIu64 " kB\n"
+		           "MemFree: %" PRIu64 " kB\n"
+		           "MemAvailable: %" PRIu64 " kB\nBuffers: %" PRIu64 " kB\n"
+		           "Cached: %" PRIu64 " kB\n",
+		           &total, &free, &buffers, &buffers, &cached) != 5) {
+			return NULL;
+		}
+
+		return fmt_human((total - free - buffers - cached) * 1024,
+		                 1024);
+	}
 #elif defined(__OpenBSD__)
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-inline int
-load_uvmexp(struct uvmexp *uvmexp)
-{
-	int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
-	size_t size;
-
-	size = sizeof(*uvmexp);
-
-	return sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0 ? 1 : 0;
-}
-
-const char *
-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);
+	#include <stdlib.h>
+	#include <sys/sysctl.h>
+	#include <sys/types.h>
+	#include <unistd.h>
+
+	#define LOG1024 	10
+	#define pagetok(size, pageshift) (size_t)(size << (pageshift - LOG1024))
+
+	inline int
+	load_uvmexp(struct uvmexp *uvmexp)
+	{
+		int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
+		size_t size;
+
+		size = sizeof(*uvmexp);
+
+		if (sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0) {
+			return 1;
+		}
+
+		return 0;
 	}
 
-	return NULL;
-}
+	const char *
+	ram_free(void)
+	{
+		struct uvmexp uvmexp;
+		int free_pages;
 
-const char *
-ram_perc(void)
-{
-	struct uvmexp uvmexp;
-	int percent;
+		if (load_uvmexp(&uvmexp)) {
+			free_pages = uvmexp.npages - uvmexp.active;
+			return fmt_human(pagetok(free_pages, uvmexp.pageshift) *
+			                 1024, 1024);
+		}
 
-	if (load_uvmexp(&uvmexp)) {
-		percent = uvmexp.active * 100 / uvmexp.npages;
-		return bprintf("%d", percent);
+		return NULL;
 	}
 
-	return NULL;
-}
+	const char *
+	ram_perc(void)
+	{
+		struct uvmexp uvmexp;
+		int percent;
 
-const char *
-ram_total(void)
-{
-	struct uvmexp uvmexp;
-	float total;
+		if (load_uvmexp(&uvmexp)) {
+			percent = uvmexp.active * 100 / uvmexp.npages;
+			return bprintf("%d", percent);
+		}
 
-	if (load_uvmexp(&uvmexp)) {
-		total = (double) (uvmexp.npages * uvmexp.pagesize) / 1024 / 1024 / 1024;
-		return bprintf("%f", total);
+		return NULL;
 	}
 
-	return NULL;
-}
+	const char *
+	ram_total(void)
+	{
+		struct uvmexp uvmexp;
 
-const char *
-ram_used(void)
-{
-	struct uvmexp uvmexp;
-	float used;
+		if (load_uvmexp(&uvmexp)) {
+			return fmt_human(pagetok(uvmexp.npages,
+			                         uvmexp.pageshift) * 1024,
+			                 1024);
+		}
 
-	if (load_uvmexp(&uvmexp)) {
-		used = (double) (uvmexp.active * uvmexp.pagesize) / 1024 / 1024 / 1024;
-		return bprintf("%f", used);
+		return NULL;
 	}
 
-	return NULL;
-}
+	const char *
+	ram_used(void)
+	{
+		struct uvmexp uvmexp;
+
+		if (load_uvmexp(&uvmexp)) {
+			return fmt_human(pagetok(uvmexp.active,
+			                         uvmexp.pageshift) * 1024,
+			                 1024);
+		}
+
+		return NULL;
+	}
 #endif