em/slstatus
1
0
Fork 0
Code Releases Activity

consistent calculation of ram_* on openbsd

Browse Source
This commit is contained in:
Tobias Tschinkowitz 2018-05-16 09:57:38 +02:00 committed by Aaron Marcher
parent ca02afb1d9
commit 82eb6e3832
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/ram.c
View File

@ -60,6 +60,7 @@
#include <unistd.h> #include <unistd.h>
#define LOG1024 10 #define LOG1024 10
#define pagetok(size, pageshift) ((size) << (pageshift - LOG1024))
inline int inline int
load_uvmexp(struct uvmexp *uvmexp) load_uvmexp(struct uvmexp *uvmexp)
@ -81,7 +82,7 @@
if (load_uvmexp(&uvmexp)) { if (load_uvmexp(&uvmexp)) {
free_pages = uvmexp.npages - uvmexp.active; free_pages = uvmexp.npages - uvmexp.active;
free = (float)(free_pages << (uvmexp.pageshift - LOG1024)) / 1024 / 1024; free = (float)(pagetok(free_pages, uvmexp.pageshift)) / 1024 / 1024;
return bprintf("%f", free); return bprintf("%f", free);
} }
@ -109,7 +110,7 @@
float total; float total;
if (load_uvmexp(&uvmexp)) { if (load_uvmexp(&uvmexp)) {
total = (float)(uvmexp.npages << (uvmexp.pageshift - LOG1024)) / 1024 / 1024; total = (float)(pagetok(uvmexp.npages, uvmexp.pageshift)) / 1024 / 1024;
return bprintf("%f", total); return bprintf("%f", total);
} }
@ -123,8 +124,7 @@
float used; float used;
if (load_uvmexp(&uvmexp)) { if (load_uvmexp(&uvmexp)) {
used = (double) (uvmexp.active * uvmexp.pagesize) / used = (float)(pagetok(uvmexp.active, uvmexp.pageshift)) / 1024 / 1024;
1024 / 1024 / 1024;
return bprintf("%f", used); return bprintf("%f", used);
} }