all repos — slstatus @ 259e106b4fbdca3df8dd660f70edf0585f14b6f6

my build of slstatus (tools.suckless.org/slstatus/)

ram: OS split
Quentin Rameau quinq@fifth.space
Mon, 30 Apr 2018 15:14:35 +0200
commit

259e106b4fbdca3df8dd660f70edf0585f14b6f6

parent

3cc649e34c61f557da885260d5542c805e66b0d8

4 files changed, 130 insertions(+), 130 deletions(-)

jump to
M MakefileMakefile

@@ -18,7 +18,7 @@ components/kernel_release\

components/keyboard_indicators\ components/load_avg\ components/num_files\ - components/ram\ + components/$(OS)/ram \ components/run_command\ components/swap\ components/temperature\
A components/Linux/ram.c

@@ -0,0 +1,52 @@

+/* See LICENSE file for copyright and license details. */ +#include <stdio.h> + +#include "../../util.h" + +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; +}
A components/OpenBSD/ram.c

@@ -0,0 +1,77 @@

+/* See LICENSE file for copyright and license details. */ +#include <stdio.h> +#include <sys/types.h> +#include <sys/sysctl.h> +#include <stdlib.h> +#include <unistd.h> + +#include "../../util.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); + } + + return NULL; +} + +const char * +ram_perc(void) +{ + struct uvmexp uvmexp; + int percent; + + if (load_uvmexp(&uvmexp)) { + percent = uvmexp.active * 100 / uvmexp.npages; + return bprintf("%d", percent); + } + + return NULL; +} + +const char * +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 NULL; +} + +const char * +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 NULL; +}
D components/ram.c

@@ -1,129 +0,0 @@

-/* See LICENSE file for copyright and license details. */ -#include <stdio.h> -#if defined (__OpenBSD__) -#include <sys/types.h> -#include <sys/sysctl.h> -#include <stdlib.h> -#include <unistd.h> -#endif - -#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; -} -#elif defined(__OpenBSD__) -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); - } - - return NULL; -} - -const char * -ram_perc(void) -{ - struct uvmexp uvmexp; - int percent; - - if (load_uvmexp(&uvmexp)) { - percent = uvmexp.active * 100 / uvmexp.npages; - return bprintf("%d", percent); - } - - return NULL; -} - -const char * -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 NULL; -} - -const char * -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 NULL; -} -#endif