diff options
| author | Alexander Nedotsukov <bland@FreeBSD.org> | 2003-09-09 03:35:10 +0000 |
|---|---|---|
| committer | Alexander Nedotsukov <bland@FreeBSD.org> | 2003-09-09 03:35:10 +0000 |
| commit | 23b84554d8df79b5db6316a2d87df77cc9cac7bb (patch) | |
| tree | 730da42eb021921719044d100813a3fe5437317a /devel/libgtop2/files/patch-ah | |
| parent | Update fetchmail port to 6.2.4 (diff) | |
- Fixes in proctime calculation.
- Fixes in procmem calculation.
- Clear libgtop_server2 responce structure to avoid use of
uninitialized memory.
- Retry read/write after EINTR wich in fact is not an error.
- A number of glibtop_errors downgraded to glibtop_warns
to avoid unxepected libgtop_server2 termination.
Notes
Notes:
svn path=/head/; revision=88830
Diffstat (limited to 'devel/libgtop2/files/patch-ah')
| -rw-r--r-- | devel/libgtop2/files/patch-ah | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah index fad02673b7ab..c01ec4e1826b 100644 --- a/devel/libgtop2/files/patch-ah +++ b/devel/libgtop2/files/patch-ah @@ -1,5 +1,5 @@ ---- sysdeps/freebsd/procmap.c.orig Mon Jun 10 17:34:42 2002 -+++ sysdeps/freebsd/procmap.c Sat Oct 26 01:20:26 2002 +--- 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> @@ -23,7 +23,17 @@ #endif int count, i = 0; int update = 0; -@@ -114,7 +119,11 @@ +@@ -108,13 +113,19 @@ + + /* 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); ++ return NULL; ++ } + /* Now we get the memory maps. */ if (kvm_read (server->machine.kd, @@ -35,7 +45,7 @@ (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace)) glibtop_error_io_r (server, "kvm_read (vmspace)"); -@@ -244,6 +253,15 @@ +@@ -244,6 +255,15 @@ &vnode, sizeof (vnode)) != sizeof (vnode)) glibtop_error_io_r (server, "kvm_read (vnode)"); @@ -51,7 +61,7 @@ if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || !vnode.v_data) continue; -@@ -252,13 +270,9 @@ +@@ -252,13 +272,9 @@ &inode, sizeof (inode)) != sizeof (inode)) glibtop_error_io_r (server, "kvm_read (inode)"); |