first status bar updated

[slstatus.git] / components / ram.c

diff --git a/components/ram.c b/components/ram.c
index 1178837..47e6fda 100644 (file)
--- a/components/ram.c
+++ b/components/ram.c
@@ -4,54 +4,77 @@
 #include "../util.h"
 
 #if defined(__linux__)
 #include "../util.h"
 
 #if defined(__linux__)

+       #include <stdint.h>
+

        const char *
        ram_free(void)
        {
        const char *
        ram_free(void)
        {

-               long free;
+               uintmax_t free;
+
+               if (pscanf("/proc/meminfo",
+                          "MemTotal: %ju kB\n"
+                          "MemFree: %ju kB\n"
+                          "MemAvailable: %ju kB\n",
+                          &free, &free, &free) != 3) {
+                       return NULL;
+               }

 
 

-               return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
-                      bprintf("%f", (float)free / 1024 / 1024) : NULL;
+               return fmt_human(free * 1024, 1024);

        }
 
        const char *
        ram_perc(void)
        {
        }
 
        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;
+               uintmax_t total, free, buffers, cached;
+
+               if (pscanf("/proc/meminfo",
+                          "MemTotal: %ju kB\n"
+                          "MemFree: %ju kB\n"
+                          "MemAvailable: %ju kB\n"
+                          "Buffers: %ju kB\n"
+                          "Cached: %ju kB\n",
+                          &total, &free, &buffers, &buffers, &cached) != 5) {
+                       return NULL;
+               }
+
+               if (total == 0) {
+                       return NULL;
+               }
+
+               return bprintf("%d", 100 * ((total - free) - (buffers + cached))
+                               / total);

        }
 
        const char *
        ram_total(void)
        {
        }
 
        const char *
        ram_total(void)
        {

-               long total;
+               uintmax_t total;
+
+               if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n", &total)
+                   != 1) {
+                       return NULL;
+               }

 
 

-               return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
-                      bprintf("%f", (float)total / 1024 / 1024) : NULL;
+               return fmt_human(total * 1024, 1024);

        }
 
        const char *
        ram_used(void)
        {
        }
 
        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;
+               uintmax_t total, free, buffers, cached;
+
+               if (pscanf("/proc/meminfo",
+                          "MemTotal: %ju kB\n"
+                          "MemFree: %ju kB\n"
+                          "MemAvailable: %ju kB\n"
+                          "Buffers: %ju kB\n"
+                          "Cached: %ju kB\n",
+                          &total, &free, &buffers, &buffers, &cached) != 5) {
+                       return NULL;
+               }
+
+               return fmt_human((total - free - buffers - cached) * 1024,
+                                1024);

        }
 #elif defined(__OpenBSD__)
        #include <stdlib.h>
        }
 #elif defined(__OpenBSD__)
        #include <stdlib.h>


@@ -59,7 +82,8 @@
        #include <sys/types.h>
        #include <unistd.h>
 
        #include <sys/types.h>
        #include <unistd.h>
 

-       #define LOG1024         10
+       #define LOG1024 10
+       #define pagetok(size, pageshift) (size_t)(size << (pageshift - LOG1024))

 
        inline int
        load_uvmexp(struct uvmexp *uvmexp)
 
        inline int
        load_uvmexp(struct uvmexp *uvmexp)


@@ -69,20 +93,23 @@
 
                size = sizeof(*uvmexp);
 
 
                size = sizeof(*uvmexp);
 

-               return sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0 ? 1 : 0;
+               if (sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0) {
+                       return 1;
+               }
+
+               return 0;

        }
 
        const char *
        ram_free(void)
        {
                struct uvmexp uvmexp;
        }
 
        const char *
        ram_free(void)
        {
                struct uvmexp uvmexp;

-               float free;

                int free_pages;
 
                if (load_uvmexp(&uvmexp)) {
                        free_pages = uvmexp.npages - uvmexp.active;
                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(pagetok(free_pages, uvmexp.pageshift) *
+                                        1024, 1024);

                }
 
                return NULL;
                }
 
                return NULL;


@@ -106,11 +133,11 @@
        ram_total(void)
        {
                struct uvmexp uvmexp;
        ram_total(void)
        {
                struct uvmexp uvmexp;

-               float total;

 
                if (load_uvmexp(&uvmexp)) {
 
                if (load_uvmexp(&uvmexp)) {

-                       total = (float)(uvmexp.npages << (uvmexp.pageshift - LOG1024)) / 1024 / 1024; 
-                       return bprintf("%f", total);
+                       return fmt_human(pagetok(uvmexp.npages,
+                                                uvmexp.pageshift) * 1024,
+                                        1024);

                }
 
                return NULL;
                }
 
                return NULL;


@@ -120,14 +147,76 @@
        ram_used(void)
        {
                struct uvmexp uvmexp;
        ram_used(void)
        {
                struct uvmexp uvmexp;

-               float used;

 
                if (load_uvmexp(&uvmexp)) {
 
                if (load_uvmexp(&uvmexp)) {

-                       used = (double) (uvmexp.active * uvmexp.pagesize) /
-                              1024 / 1024 / 1024;
-                       return bprintf("%f", used);
+                       return fmt_human(pagetok(uvmexp.active,
+                                                uvmexp.pageshift) * 1024,
+                                        1024);

                }
 
                return NULL;
        }
                }
 
                return NULL;
        }

+#elif defined(__FreeBSD__)
+       #include <sys/sysctl.h>
+       #include <sys/vmmeter.h>
+       #include <unistd.h>
+       #include <vm/vm_param.h>
+
+       const char *
+       ram_free(void) {
+               struct vmtotal vm_stats;
+               int mib[] = {CTL_VM, VM_TOTAL};
+               size_t len;
+
+               len = sizeof(struct vmtotal);
+               if (sysctl(mib, 2, &vm_stats, &len, NULL, 0) == -1
+                               || !len)
+                       return NULL;
+
+               return fmt_human(vm_stats.t_free * getpagesize(), 1024);
+       }
+
+       const char *
+       ram_total(void) {
+               long npages;
+               size_t len;
+
+               len = sizeof(npages);
+               if (sysctlbyname("vm.stats.vm.v_page_count", &npages, &len, NULL, 0) == -1
+                               || !len)
+                       return NULL;
+
+               return fmt_human(npages * getpagesize(), 1024);
+       }
+
+       const char *
+       ram_perc(void) {
+               long npages;
+               long active;
+               size_t len;
+
+               len = sizeof(npages);
+               if (sysctlbyname("vm.stats.vm.v_page_count", &npages, &len, NULL, 0) == -1
+                               || !len)
+                       return NULL;
+
+               if (sysctlbyname("vm.stats.vm.v_active_count", &active, &len, NULL, 0) == -1
+                               || !len)
+                       return NULL;
+
+               return bprintf("%d", active * 100 / npages);
+       }
+
+       const char *
+       ram_used(void) {
+               long active;
+               size_t len;
+
+               len = sizeof(active);
+               if (sysctlbyname("vm.stats.vm.v_active_count", &active, &len, NULL, 0) == -1
+                               || !len)
+                       return NULL;
+
+               return fmt_human(active * getpagesize(), 1024);
+       }

 #endif
 #endif