From 9750a3d731cd381e832bcacf1d03e48ddb46cc16 Mon Sep 17 00:00:00 2001 From: Laslo Hunhold Date: Tue, 1 May 2018 19:01:22 +0200 Subject: Use indentation to increase readability Granted, this style is definitely not common, but for the short utility-functions of this program it's just the right choice. This provides great flexibility, such that in the long run, it will be possible to also share code between the OS-implementations. This also keeps the state-keeping at a minimum and makes it clearer which functions are implemented on which OS without having to jiggle around with too many files in the process. --- components/ram.c | 220 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 112 insertions(+), 108 deletions(-) (limited to 'components/ram.c') diff --git a/components/ram.c b/components/ram.c index 55ec5b9..5611022 100644 --- a/components/ram.c +++ b/components/ram.c @@ -1,129 +1,133 @@ /* See LICENSE file for copyright and license details. */ #include -#if defined (__OpenBSD__) -#include -#include -#include -#include -#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); + 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; } - return 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__) + #include + #include + #include + #include + + inline int + load_uvmexp(struct uvmexp *uvmexp) + { + int uvmexp_mib[] = {CTL_VM, VM_UVMEXP}; + size_t size; + + size = sizeof(*uvmexp); -const char * -ram_perc(void) -{ - struct uvmexp uvmexp; - int percent; + return sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0 ? 1 : 0; + } - if (load_uvmexp(&uvmexp)) { - percent = uvmexp.active * 100 / uvmexp.npages; - return bprintf("%d", percent); + 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; } - 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; + float total; -const char * -ram_used(void) -{ - struct uvmexp uvmexp; - float used; + if (load_uvmexp(&uvmexp)) { + total = (double) (uvmexp.npages * uvmexp.pagesize) / + 1024 / 1024 / 1024; + return bprintf("%f", total); + } - 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; + float used; + + if (load_uvmexp(&uvmexp)) { + used = (double) (uvmexp.active * uvmexp.pagesize) / + 1024 / 1024 / 1024; + return bprintf("%f", used); + } + + return NULL; + } #endif -- cgit v1.2.3