|
Lines 1-5
Link Here
|
| 1 |
--- sysdeps/freebsd/procmap.c.orig 2015-08-17 18:59:37 UTC |
1 |
--- sysdeps/freebsd/procmap.c.orig 2017-08-07 18:43:41.000000000 -0400 |
| 2 |
+++ sysdeps/freebsd/procmap.c |
2 |
+++ sysdeps/freebsd/procmap.c 2019-12-10 09:04:59.238100000 -0500 |
| 3 |
@@ -52,6 +52,8 @@ |
3 |
@@ -52,6 +52,8 @@ |
| 4 |
#include <sys/mount.h> |
4 |
#include <sys/mount.h> |
| 5 |
#include <ufs/ufs/quota.h> |
5 |
#include <ufs/ufs/quota.h> |
|
Lines 9-15
Link Here
|
| 9 |
#include <fs/devfs/devfs.h> |
9 |
#include <fs/devfs/devfs.h> |
| 10 |
#if (__FreeBSD_version >= 600006) || defined(__FreeBSD_kernel__) |
10 |
#if (__FreeBSD_version >= 600006) || defined(__FreeBSD_kernel__) |
| 11 |
#include <fs/devfs/devfs_int.h> |
11 |
#include <fs/devfs/devfs_int.h> |
| 12 |
@@ -86,6 +88,8 @@ _glibtop_sysdeps_freebsd_dev_inode (glib |
12 |
@@ -95,6 +97,8 @@ |
| 13 |
struct cdev_priv priv; |
13 |
struct cdev_priv priv; |
| 14 |
#if __FreeBSD_version < 800039 |
14 |
#if __FreeBSD_version < 800039 |
| 15 |
struct cdev si; |
15 |
struct cdev si; |
|
Lines 18-26
Link Here
|
| 18 |
#endif |
18 |
#endif |
| 19 |
|
19 |
|
| 20 |
*inum = 0; |
20 |
*inum = 0; |
| 21 |
@@ -167,7 +171,9 @@ _glibtop_sysdeps_freebsd_dev_inode (glib |
21 |
@@ -202,7 +206,9 @@ |
| 22 |
|
22 |
|
| 23 |
|
23 |
#else /* older versions */ |
| 24 |
#if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039) |
24 |
#if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039) |
| 25 |
- if (kvm_read (server->machine->kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv, |
25 |
- if (kvm_read (server->machine->kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv, |
| 26 |
+ if (kvm_read (server->machine->kd, (gulong) inode.i_ump, (char *) &um, |
26 |
+ if (kvm_read (server->machine->kd, (gulong) inode.i_ump, (char *) &um, |
|
Lines 29-31
Link Here
|
| 29 |
sizeof (priv)) |
29 |
sizeof (priv)) |
| 30 |
#else |
30 |
#else |
| 31 |
if (kvm_read (server->machine->kd, (gulong) inode.i_dev, (char *) &si, |
31 |
if (kvm_read (server->machine->kd, (gulong) inode.i_dev, (char *) &si, |
|
|
32 |
@@ -273,10 +279,10 @@ |
| 33 |
return NULL; |
| 34 |
} |
| 35 |
|
| 36 |
- first = vmspace.vm_map.header.next; |
| 37 |
+ first = vmspace.vm_map.header.left; |
| 38 |
|
| 39 |
if (kvm_read (server->machine->kd, |
| 40 |
- (gulong) vmspace.vm_map.header.next, |
| 41 |
+ (gulong) vmspace.vm_map.header.left, |
| 42 |
(char *) &entry, sizeof (entry)) != sizeof (entry)) { |
| 43 |
glibtop_warn_io_r (server, "kvm_read (entry)"); |
| 44 |
glibtop_suid_leave (server); |
| 45 |
@@ -299,7 +305,7 @@ |
| 46 |
|
| 47 |
if (update) { |
| 48 |
if (kvm_read (server->machine->kd, |
| 49 |
- (gulong) entry.next, |
| 50 |
+ (gulong) entry.left, |
| 51 |
(char *) &entry, sizeof (entry)) != sizeof (entry)) { |
| 52 |
glibtop_warn_io_r (server, "kvm_read (entry)"); |
| 53 |
continue; |
| 54 |
@@ -377,7 +383,7 @@ |
| 55 |
if (entry.protection & VM_PROT_EXECUTE) |
| 56 |
mentry->perm |= GLIBTOP_MAP_PERM_EXECUTE; |
| 57 |
|
| 58 |
- } while (entry.next != first); |
| 59 |
+ } while (entry.left != first); |
| 60 |
|
| 61 |
glibtop_suid_leave (server); |
| 62 |
|