ram: OS split

diff --git a/Makefile b/Makefile
index bbb18a938d16324c8da69b5d31aaa50ba17e3a43..99d10c576cf4321be41e2886aeff59a8b9e6a2d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ COM =\
        components/keyboard_indicators\
        components/load_avg\
        components/num_files\
-       components/ram\
+       components/$(OS)/ram \
        components/run_command\
        components/swap\
        components/temperature\

diff --git a/components/Linux/ram.c b/components/Linux/ram.c
new file mode 100644 (file)
index 0000000..7df5f85
--- /dev/null
+++ b/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;
+}

diff --git a/components/OpenBSD/ram.c b/components/OpenBSD/ram.c
new file mode 100644 (file)
index 0000000..f7c81d1
--- /dev/null
+++ b/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;
+}

diff --git a/components/ram.c b/components/ram.c
deleted file mode 100644 (file)
index 55ec5b9..0000000
--- a/components/ram.c
+++ /dev/null
@@ -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