From eaff15b741e977c355cbdb5c71d1f60dd677180a Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Tue, 30 Aug 2011 14:44:43 +0200 Subject: [PATCH] NetBSD-5.99.21 lost struct uvmexp.swap{ins,outs} In NetBSD-5.99.21, the uarea swap-out functionality was removed, which also removed two members from struct uvmexp, swapins and swapouts. --- sysdeps/bsd/swap.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sysdeps/bsd/swap.c b/sysdeps/bsd/swap.c index 0ac9cd3d..388816ff 100644 --- a/sysdeps/bsd/swap.c +++ b/sysdeps/bsd/swap.c @@ -195,29 +195,32 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) buf->pagein = vmm.v_swappgsin - swappgsin; buf->pageout = vmm.v_swappgsout - swappgsout; -#else -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__) +#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100) + /* no uvmexp.swap{ins,outs} */ + buf->pagein = 0; + buf->pageout = 0; +#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__) buf->pagein = uvmexp.swapins - swappgsin; buf->pageout = uvmexp.swapouts - swappgsout; #else buf->pagein = vmm.v_swpin - swappgsin; buf->pageout = vmm.v_swpout - swappgsout; -#endif #endif } #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) swappgsin = vmm.v_swappgsin; swappgsout = vmm.v_swappgsout; -#else -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__) +#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100) + swappgsin = 0; + swappgsout = 0; +#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__) swappgsin = uvmexp.swapins; swappgsout = uvmexp.swapouts; #else swappgsin = vmm.v_swpin; swappgsout = vmm.v_swpout; #endif -#endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)