2001-09-19 10:37:49 -04:00
|
|
|
$OpenBSD: patch-sysdeps_freebsd_mem.c,v 1.2 2001/09/19 14:37:49 naddy Exp $
|
2001-09-13 16:45:46 -04:00
|
|
|
--- sysdeps/freebsd/mem.c.orig Sun Feb 13 16:47:58 2000
|
|
|
|
|
+++ sysdeps/freebsd/mem.c Mon Aug 27 17:02:38 2001
|
|
|
|
|
@@ -31,7 +31,7 @@
|
|
|
|
|
#include <sys/vmmeter.h>
|
|
|
|
|
#include <vm/vm_param.h>
|
|
|
|
|
|
|
|
|
|
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
|
|
|
|
|
+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || defined(OpenBSD)
|
|
|
|
|
#include <uvm/uvm_extern.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
@@ -57,7 +57,7 @@ static int pageshift; /* log base 2 of
|
|
|
|
|
|
|
|
|
|
/* nlist structure for kernel access */
|
|
|
|
|
static struct nlist nlst [] = {
|
|
|
|
|
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
|
|
|
|
|
+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || defined(OpenBSD)
|
|
|
|
|
{ "_bufpages" },
|
|
|
|
|
{ 0 }
|
|
|
|
|
#else
|
|
|
|
|
@@ -81,7 +81,7 @@ static int mib [] = { CTL_VM, VM_TOTAL }
|
|
|
|
|
static int mib [] = { CTL_VM, VM_METER };
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
|
|
|
|
|
+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || defined(OpenBSD)
|
|
|
|
|
static int mib_uvmexp [] = { CTL_VM, VM_UVMEXP };
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
@@ -117,7 +117,7 @@ glibtop_get_mem_p (glibtop *server, glib
|
|
|
|
|
{
|
|
|
|
|
struct vmtotal vmt;
|
|
|
|
|
size_t length_vmt;
|
|
|
|
|
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
|
|
|
|
|
+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || defined(OpenBSD)
|
|
|
|
|
struct uvmexp uvmexp;
|
|
|
|
|
size_t length_uvmexp;
|
|
|
|
|
#else
|
|
|
|
|
@@ -146,7 +146,7 @@ glibtop_get_mem_p (glibtop *server, glib
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
|
|
|
|
|
+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || defined(OpenBSD)
|
|
|
|
|
length_uvmexp = sizeof (uvmexp);
|
|
|
|
|
if (sysctl (mib_uvmexp, 2, &uvmexp, &length_uvmexp, NULL, 0)) {
|
|
|
|
|
glibtop_warn_io_r (server, "sysctl (uvmexp)");
|
|
|
|
|
@@ -172,7 +172,7 @@ glibtop_get_mem_p (glibtop *server, glib
|
|
|
|
|
#if defined(__FreeBSD__)
|
|
|
|
|
v_total_count = vmm.v_page_count;
|
|
|
|
|
#else
|
|
|
|
|
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
|
|
|
|
|
+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || defined(OpenBSD)
|
|
|
|
|
v_total_count = uvmexp.reserve_kernel +
|
|
|
|
|
uvmexp.reserve_pagedaemon +
|
|
|
|
|
uvmexp.free + uvmexp.wired + uvmexp.active +
|
|
|
|
|
@@ -184,7 +184,7 @@ glibtop_get_mem_p (glibtop *server, glib
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
|
|
|
|
|
+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || defined(OpenBSD)
|
|
|
|
|
v_used_count = uvmexp.active + uvmexp.inactive;
|
|
|
|
|
v_free_count = uvmexp.free;
|
|
|
|
|
#else
|
|
|
|
|
@@ -200,7 +200,7 @@ glibtop_get_mem_p (glibtop *server, glib
|
|
|
|
|
buf->cached = (u_int64_t) pagetok (vmm.v_cache_count) << LOG1024;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
|
|
|
|
|
+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || defined(OpenBSD)
|
|
|
|
|
buf->locked = (u_int64_t) pagetok (uvmexp.wired) << LOG1024;
|
|
|
|
|
#else
|
|
|
|
|
buf->locked = (u_int64_t) pagetok (vmm.v_wire_count) << LOG1024;
|
