summaryrefslogtreecommitdiff
path: root/devel/libgtop/patches/patch-ak
blob: 203926439d40a09cffc6a836ebfc244932f8e17f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
$NetBSD: patch-ak,v 1.2 1998/11/01 23:22:19 tron Exp $

--- sysdeps/bsd/procmap.c	1998/10/07 12:03:03	1.1
+++ sysdeps/bsd/procmap.c	1998/10/07 12:09:41
@@ -33,6 +33,9 @@
 #include <vm/vm_object.h>
 #include <vm/vm_prot.h>
 #include <vm/vm_map.h>
+#ifdef __NetBSD__
+#include <vm/vnode_pager.h>
+#endif
 
 #include <sys/vnode.h>
 #include <sys/mount.h>
@@ -130,8 +133,16 @@
 			update = 1;
 		}
 
+#ifdef __FreeBSD__
 		if (entry.eflags & (MAP_ENTRY_IS_A_MAP|MAP_ENTRY_IS_SUB_MAP))
 			continue;
+#elseif defined(UVM)
+		if (entry.eflags & (MAP_ENTRY_IS_A_MAP|MAP_ENTRY_IS_SUB_MAP))
+			continue;
+#else
+		if (entry.is_a_map || entry.is_sub_map)
+			continue;
+#endif
 
 		maps [i].flags  = _glibtop_sysdeps_map_entry;
 
@@ -162,16 +173,26 @@
 
 		/* If the object is of type vnode, add its size */
 
+#ifdef __FreeBSD__
 		if (object.type != OBJT_VNODE)
 			continue;
-
 		if (!object.handle)
 			continue;
-		
 		if (kvm_read (server->machine.kd,
 			      (unsigned long) object.handle,
 			      &vnode, sizeof (vnode)) != sizeof (vnode))
 			glibtop_error_io_r (server, "kvm_read (vnode)");
+#else
+		if (object.pager->pg_type != PG_VNODE)
+			continue;
+		if (!object.pager->pg_handle)
+			continue;
+		if (kvm_read (server->machine.kd,
+			      (unsigned long) object.pager->pg_handle,
+			      &vnode, sizeof (vnode)) != sizeof (vnode))
+			glibtop_error_io_r (server, "kvm_read (vnode)");
+#endif
+
 
 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
 		    !vnode.v_data) continue;