#include "../util.h"
#if defined(__linux__)
+ #include <stdint.h>
+
const char *
ram_free(void)
{
- long free;
-
- return (pscanf("/proc/meminfo",
- "MemTotal: %ld kB\n"
- "MemFree: %ld kB\n"
- "MemAvailable: %ld kB\n",
- &free, &free, &free) == 3) ?
- fmt_human_2(free * 1024, "B") : NULL;
+ 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 fmt_human(free * 1024, 1024);
}
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)
{
- long total;
+ uintmax_t total;
- return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
- fmt_human_2(total * 1024, "B") : NULL;
+ if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n", &total)
+ != 1) {
+ return NULL;
+ }
+
+ return fmt_human(total * 1024, 1024);
}
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) ?
- fmt_human_2((total - free - buffers - cached) * 1024, "B") : 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>
#include <sys/types.h>
#include <unistd.h>
- #define LOG1024 10
- #define pagetok(size, pageshift) ((size) << (pageshift - LOG1024))
+ #define LOG1024 10
+ #define pagetok(size, pageshift) (size_t)(size << (pageshift - LOG1024))
inline int
load_uvmexp(struct uvmexp *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 *
if (load_uvmexp(&uvmexp)) {
free_pages = uvmexp.npages - uvmexp.active;
- return fmt_human_2(pagetok(free_pages, uvmexp.pageshift) * 1024, "B");
+ return fmt_human(pagetok(free_pages, uvmexp.pageshift) *
+ 1024, 1024);
}
return NULL;
if (load_uvmexp(&uvmexp)) {
percent = uvmexp.active * 100 / uvmexp.npages;
- return bprintf("%d%%", percent);
+ return bprintf("%d", percent);
}
return NULL;
struct uvmexp uvmexp;
if (load_uvmexp(&uvmexp)) {
- return fmt_human_2(pagetok(uvmexp.npages, uvmexp.pageshift) * 1024, "B");
+ return fmt_human(pagetok(uvmexp.npages,
+ uvmexp.pageshift) * 1024,
+ 1024);
}
return NULL;
struct uvmexp uvmexp;
if (load_uvmexp(&uvmexp)) {
- return fmt_human_2(pagetok(uvmexp.active, uvmexp.pageshift) * 1024, "B");
+ return fmt_human(pagetok(uvmexp.active,
+ uvmexp.pageshift) * 1024,
+ 1024);
}
return NULL;