diff options
Diffstat (limited to 'devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c')
| -rw-r--r-- | devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c index 83e508054..5cab09957 100644 --- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c +++ b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c @@ -1,5 +1,5 @@ ---- sysdeps/freebsd/procmem.c.orig Sun Oct 19 12:55:32 2003 -+++ sysdeps/freebsd/procmem.c Sat Feb 7 22:48:12 2004 +--- sysdeps/freebsd/procmem.c.orig Tue Oct 21 18:54:24 2003 ++++ sysdeps/freebsd/procmem.c Sun Feb 15 15:43:11 2004 @@ -117,7 +117,7 @@ #else struct vm_object object; @@ -9,45 +9,44 @@ int count; glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0); -@@ -137,15 +137,29 @@ +@@ -136,16 +136,28 @@ + glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); return; } ++#if __FreeBSD_version >= 500013 - if (kvm_read (server->machine.kd, - (unsigned long) pinfo [0].kp_proc.p_limit, - (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) { - glibtop_warn_io_r (server, "kvm_read (plimit)"); -+#if __FreeBSD_version >= 500013 -+ -+#define XXX_P_VMSPACE ki_vmspace -+ ++#define XXX_P_VMSPACE ki_vmspace + buf->rss_rlim = pinfo [0].ki_rssize; + + buf->vsize = (u_int64_t) pinfo [0].ki_size; + buf->size = (u_int64_t) pagetok -+ (pinfo [0].ki_tsize + pinfo [0].ki_dsize + pinfo[0].ki_ssize) ++ (pinfo [0].ki_tsize + pinfo [0].ki_dsize + pinfo[0].ki_ssize) + << LOG1024; + buf->resident = buf->rss = (u_int64_t) pagetok -+ (pinfo [0].ki_rssize) << LOG1024; ++ (pinfo [0].ki_rssize) << LOG1024; + +#else + -+#define XXX_P_VMSPACE kp_proc.p_vmspace ++#define XXX_P_VMSPACE kp_proc.p_vmspace + + if (getrlimit (RLIMIT_RSS, &rlimit) < 0) { + glibtop_warn_io_r (server, "getrlimit"); return; } -- buf->rss_rlim = (u_int64_t) +- buf->rss_rlim = (guint64) - (plimit.pl_rlimit [RLIMIT_RSS].rlim_cur); + buf->rss_rlim = (u_int64_t) (rlimit.rlim_cur); vms = &pinfo [0].kp_eproc.e_vm; -@@ -154,11 +168,12 @@ +@@ -154,11 +166,12 @@ - buf->resident = buf->rss = (u_int64_t) pagetok + buf->resident = buf->rss = (guint64) pagetok (vms->vm_rssize) << LOG1024; +#endif |