summaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorbland <bland@FreeBSD.org>2005-03-18 18:16:38 +0000
committerbland <bland@FreeBSD.org>2005-03-18 18:16:38 +0000
commit87cb62b7a9e45b9efa000008641c3d847d77447e (patch)
treee5bd88e204587c8ec51e0fda333affef11e42941 /devel
parentd4ca126c3f501905892608240a47bb22ec94af84 (diff)
downloadFreeBSD-ports-87cb62b7a9e45b9efa000008641c3d847d77447e.zip
FreeBSD-ports-87cb62b7a9e45b9efa000008641c3d847d77447e.tar.gz
Downgrade glibtop_error_io() to glibtop_warn_io() on failed kvm_getprocs().
There is realy nothing abnormal if client app trying to query data for just dissapeared process. glibtop_error_io() call always end up with exit() which is not what people may expect.
Diffstat (limited to 'devel')
-rw-r--r--devel/libgtop2/Makefile1
-rw-r--r--devel/libgtop2/files/patch-systeps::freebsd::prockernel.c15
-rw-r--r--devel/libgtop2/files/patch-systeps::freebsd::procmap.c11
-rw-r--r--devel/libgtop2/files/patch-systeps::freebsd::proctime.c15
4 files changed, 42 insertions, 0 deletions
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 5a15a46..2b31a5a 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libgtop2
PORTVERSION= 2.10.0
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10
diff --git a/devel/libgtop2/files/patch-systeps::freebsd::prockernel.c b/devel/libgtop2/files/patch-systeps::freebsd::prockernel.c
new file mode 100644
index 0000000..f23b1cd
--- /dev/null
+++ b/devel/libgtop2/files/patch-systeps::freebsd::prockernel.c
@@ -0,0 +1,15 @@
+--- sysdeps/freebsd/prockernel.c Mon Jul 19 05:33:56 2004
++++ sysdeps/freebsd/prockernel.c.orig Sat Mar 19 02:39:47 2005
+@@ -115,8 +115,10 @@
+
+ /* Get the process information */
+ 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);
++ return;
++ }
+
+ #if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+
diff --git a/devel/libgtop2/files/patch-systeps::freebsd::procmap.c b/devel/libgtop2/files/patch-systeps::freebsd::procmap.c
new file mode 100644
index 0000000..c8c701e
--- /dev/null
+++ b/devel/libgtop2/files/patch-systeps::freebsd::procmap.c
@@ -0,0 +1,11 @@
+--- sysdeps/freebsd/procmap.c Wed Feb 23 17:20:45 2005
++++ sysdeps/freebsd/procmap.c.orig Sat Mar 19 02:46:57 2005
+@@ -129,7 +129,7 @@
+ /* 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);
++ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
+ return NULL;
+ }
+
diff --git a/devel/libgtop2/files/patch-systeps::freebsd::proctime.c b/devel/libgtop2/files/patch-systeps::freebsd::proctime.c
new file mode 100644
index 0000000..da0908c
--- /dev/null
+++ b/devel/libgtop2/files/patch-systeps::freebsd::proctime.c
@@ -0,0 +1,15 @@
+--- sysdeps/freebsd/proctime.c Wed Feb 23 17:20:45 2005
++++ sysdeps/freebsd/proctime.c.orig Sat Mar 19 02:38:31 2005
+@@ -146,8 +146,10 @@
+
+ /* Get the process information */
+ 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);
++ return;
++ }
+
+ #if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+ buf->rtime = pinfo [0].ki_runtime;
OpenPOWER on IntegriCloud