summaryrefslogtreecommitdiff
path: root/devel/libgtop2/files/patch-ah
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-04-05 03:11:39 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-04-05 03:11:39 +0000
commitc4851e78e4f63338fe9a4883e5b7a0370dce27f7 (patch)
tree3910aa2e83f782cec94f15b4547dadb741cd29ce /devel/libgtop2/files/patch-ah
parentAdd gnomekeyring, an API and daemon for managing lists of credentials. This (diff)
Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release
ever. It fixes many bugs, and adds some features missing in previous FreeBSD ports. To help users upgrade from GNOME 2.4, we have constructed an upgrade FAQ at: http://www.freebsd.org/gnome/docs/faq26.html Please read it carefully. GNOME 2.6 packages are also available for all supported i386 versions of FreeBSD at: http://www.marcuscom.com/tinderbox/ The FreeBSD GNOME Team would like the thank the following users for their wonderful testing and patching efforts. We would especially like to thank Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen. Without these people, our team, and our team alumni, GNOME on FreeBSD would not be possible. Jeremy Messenger <mezz7@cox.net> Khairil Yusof <kaeru@pd.jaring.my> Koop Mast <kwm@rainbow-runner.nl> Simon Barner <barner@in.tum.de> Tom McLaughlin <tmclaugh@sdf.lonestar.org> Scott Dodson <sdodson@sdodson.com> Vladimir Grebenschikov <vova@sw.ru>
Notes
Notes: svn path=/head/; revision=106172
Diffstat (limited to 'devel/libgtop2/files/patch-ah')
-rw-r--r--devel/libgtop2/files/patch-ah58
1 files changed, 9 insertions, 49 deletions
diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah
index c01ec4e1826b..bbffe4a0c430 100644
--- a/devel/libgtop2/files/patch-ah
+++ b/devel/libgtop2/files/patch-ah
@@ -1,67 +1,27 @@
---- sysdeps/freebsd/procmap.c.orig Fri May 28 03:56:48 1999
-+++ sysdeps/freebsd/procmap.c Tue Sep 9 11:38:18 2003
-@@ -33,7 +33,11 @@
- #include <sys/proc.h>
- #include <sys/resource.h>
- #include <vm/vm_object.h>
-+#if (__FreeBSD_version >= 400011)
-+#include <vm/vm.h>
-+#else
- #include <vm/vm_prot.h>
-+#endif
- #include <vm/vm_map.h>
-
- #include <sys/vnode.h>
-@@ -91,8 +95,9 @@
+--- sysdeps/freebsd/procmap.c.orig Wed Mar 10 21:23:52 2004
++++ sysdeps/freebsd/procmap.c Thu Mar 11 21:45:33 2004
+@@ -104,7 +104,7 @@
glibtop_map_entry *maps;
#if defined __FreeBSD__
struct vnode vnode;
+-#if __FreeBSD_version >= 500039
+#if __FreeBSD_version < 500039
struct inode inode;
-- struct mount mount;
-+#endif
#endif
- int count, i = 0;
- int update = 0;
-@@ -108,13 +113,19 @@
+ #endif
+@@ -122,8 +122,10 @@
/* Get the process data */
pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
- if ((pinfo == NULL) || (count < 1))
-- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
+ if ((pinfo == NULL) || (count < 1)) {
-+ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
+ glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
+ return NULL;
+ }
/* Now we get the memory maps. */
- if (kvm_read (server->machine.kd,
-+#if (__FreeBSD_version >= 500013)
-+ (unsigned long) pinfo [0].ki_vmspace,
-+#else
- (unsigned long) pinfo [0].kp_proc.p_vmspace,
-+#endif
- (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace))
- glibtop_error_io_r (server, "kvm_read (vmspace)");
-
-@@ -244,6 +255,15 @@
- &vnode, sizeof (vnode)) != sizeof (vnode))
- glibtop_error_io_r (server, "kvm_read (vnode)");
-
-+#if __FreeBSD_version >= 500039
-+ switch (vnode.v_type) {
-+ case VREG:
-+ maps [i-1].inode = vnode.v_cachedid;
-+ maps [i-1].device = vnode.v_cachedfs;
-+ default:
-+ continue;
-+ }
-+#else
- if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
- !vnode.v_data) continue;
-
-@@ -252,13 +272,9 @@
+@@ -280,13 +282,9 @@
&inode, sizeof (inode)) != sizeof (inode))
glibtop_error_io_r (server, "kvm_read (inode)");
@@ -69,7 +29,7 @@
- (unsigned long) vnode.v_mount,
- &mount, sizeof (mount)) != sizeof (mount))
- glibtop_error_io_r (server, "kvm_read (mount)");
--
+-#endif
maps [i-1].inode = inode.i_number;
maps [i-1].device = inode.i_dev;
+#endif