Implement fmt_scaled for ram_* functions
This commit is contained in:
parent
49d1e5fae2
commit
d0c68989cd
|
@ -14,7 +14,7 @@
|
||||||
"MemFree: %ld kB\n"
|
"MemFree: %ld kB\n"
|
||||||
"MemAvailable: %ld kB\n",
|
"MemAvailable: %ld kB\n",
|
||||||
&free, &free, &free) == 3) ?
|
&free, &free, &free) == 3) ?
|
||||||
bprintf("%f", (float)free / 1024 / 1024) : NULL;
|
fmt_scaled(free * 1024) : NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *
|
const char *
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
long total;
|
long total;
|
||||||
|
|
||||||
return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
|
return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
|
||||||
bprintf("%f", (float)total / 1024 / 1024) : NULL;
|
fmt_scaled(total * 1024) : NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *
|
const char *
|
||||||
|
@ -53,9 +53,7 @@
|
||||||
"MemAvailable: %ld kB\nBuffers: %ld kB\n"
|
"MemAvailable: %ld kB\nBuffers: %ld kB\n"
|
||||||
"Cached: %ld kB\n",
|
"Cached: %ld kB\n",
|
||||||
&total, &free, &buffers, &buffers, &cached) == 5) ?
|
&total, &free, &buffers, &buffers, &cached) == 5) ?
|
||||||
bprintf("%f", (float)(total - free - buffers - cached) /
|
fmt_scaled((total - free - buffers - cached) * 1024) : NULL;
|
||||||
1024 / 1024) :
|
|
||||||
NULL;
|
|
||||||
}
|
}
|
||||||
#elif defined(__OpenBSD__)
|
#elif defined(__OpenBSD__)
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -81,13 +79,11 @@
|
||||||
ram_free(void)
|
ram_free(void)
|
||||||
{
|
{
|
||||||
struct uvmexp uvmexp;
|
struct uvmexp uvmexp;
|
||||||
float free;
|
|
||||||
int free_pages;
|
int free_pages;
|
||||||
|
|
||||||
if (load_uvmexp(&uvmexp)) {
|
if (load_uvmexp(&uvmexp)) {
|
||||||
free_pages = uvmexp.npages - uvmexp.active;
|
free_pages = uvmexp.npages - uvmexp.active;
|
||||||
free = (float)(pagetok(free_pages, uvmexp.pageshift)) / 1024 / 1024;
|
return fmt_scaled(pagetok(free_pages, uvmexp.pageshift) * 1024);
|
||||||
return bprintf("%f", free);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -111,11 +107,9 @@
|
||||||
ram_total(void)
|
ram_total(void)
|
||||||
{
|
{
|
||||||
struct uvmexp uvmexp;
|
struct uvmexp uvmexp;
|
||||||
float total;
|
|
||||||
|
|
||||||
if (load_uvmexp(&uvmexp)) {
|
if (load_uvmexp(&uvmexp)) {
|
||||||
total = (float)(pagetok(uvmexp.npages, uvmexp.pageshift)) / 1024 / 1024;
|
return fmt_scaled(pagetok(uvmexp.npages, uvmexp.pageshift) * 1024);
|
||||||
return bprintf("%f", total);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -125,11 +119,9 @@
|
||||||
ram_used(void)
|
ram_used(void)
|
||||||
{
|
{
|
||||||
struct uvmexp uvmexp;
|
struct uvmexp uvmexp;
|
||||||
float used;
|
|
||||||
|
|
||||||
if (load_uvmexp(&uvmexp)) {
|
if (load_uvmexp(&uvmexp)) {
|
||||||
used = (float)(pagetok(uvmexp.active, uvmexp.pageshift)) / 1024 / 1024;
|
return fmt_scaled(pagetok(uvmexp.active, uvmexp.pageshift) * 1024);
|
||||||
return bprintf("%f", used);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Reference in New Issue