From 82eb6e3832dea63be4c22ac4415c3190add43f0b Mon Sep 17 00:00:00 2001 From: Tobias Tschinkowitz Date: Wed, 16 May 2018 09:57:38 +0200 Subject: [PATCH] consistent calculation of ram_* on openbsd --- components/ram.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/ram.c b/components/ram.c index 1178837..57081d2 100644 --- a/components/ram.c +++ b/components/ram.c @@ -60,6 +60,7 @@ #include #define LOG1024 10 + #define pagetok(size, pageshift) ((size) << (pageshift - LOG1024)) inline int load_uvmexp(struct uvmexp *uvmexp) @@ -81,7 +82,7 @@ if (load_uvmexp(&uvmexp)) { 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); } @@ -109,7 +110,7 @@ float total; 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); } @@ -123,8 +124,7 @@ float used; if (load_uvmexp(&uvmexp)) { - used = (double) (uvmexp.active * uvmexp.pagesize) / - 1024 / 1024 / 1024; + used = (float)(pagetok(uvmexp.active, uvmexp.pageshift)) / 1024 / 1024; return bprintf("%f", used); }