Revert aac29e2 as it is nonsense

[slstatus.git] / components / ram.c

diff --git a/components/ram.c b/components/ram.c
index 1178837..8f96b04 100644 (file)
--- 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 *
@@ -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,9 +53,7 @@
                               "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 <stdlib.h>
@@ -60,6 +62,7 @@
        #include <unistd.h>
 
        #define LOG1024         10
+       #define pagetok(size, pageshift) ((size) << (pageshift - LOG1024))
 
        inline int
        load_uvmexp(struct uvmexp *uvmexp)
@@ -76,13 +79,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_scaled(pagetok(free_pages, uvmexp.pageshift) * 1024);
                }
 
                return NULL;
@@ -106,11 +107,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_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;