Author: jhb
Date: Fri Jul 15 17:23:45 2011
New Revision: 224062
URL: http://svn.freebsd.org/changeset/base/224062
Log:
Revert 130163 and let top use KERN_PROC_PROC when individual threads are
not displayed. The KERN_PROC_PROC sysctl was fixed in 188764.
Modified:
head/usr.bin/top/machine.c
Modified: head/usr.bin/top/machine.c
==============================================================================
--- head/usr.bin/top/machine.c Fri Jul 15 16:20:33 2011 (r224061)
+++ head/usr.bin/top/machine.c Fri Jul 15 17:23:45 2011 (r224062)
@@ -624,7 +624,6 @@ get_process_info(struct system_info *si,
int active_procs;
struct kinfo_proc **prefp;
struct kinfo_proc *pp;
- struct kinfo_proc *prev_pp = NULL;
/* these are copied out of sel for speed */
int show_idle;
@@ -657,7 +656,8 @@ get_process_info(struct system_info *si,
}
previous_proc_count = nproc;
- pbase = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nproc);
+ pbase = kvm_getprocs(kd, sel->thread ? KERN_PROC_ALL : KERN_PROC_PROC,
+ 0, &nproc);
if (nproc > onproc)
pref = realloc(pref, sizeof(*pref) * (onproc = nproc));
if (pref == NULL || pbase == NULL) {
@@ -727,21 +727,8 @@ get_process_info(struct system_info *si,
/* skip proc. that don't belong to the selected UID */
continue;
- /*
- * When not showing threads, take the first thread
- * for output and add the fields that we can from
- * the rest of the process's threads rather than
- * using the system's mostly-broken KERN_PROC_PROC.
- */
- if (sel->thread || prev_pp == NULL ||
- prev_pp->ki_pid != pp->ki_pid) {
- *prefp++ = pp;
- active_procs++;
- prev_pp = pp;
- } else {
- prev_pp->ki_pctcpu += pp->ki_pctcpu;
- prev_pp->ki_runtime += pp->ki_runtime;
- }
+ *prefp++ = pp;
+ active_procs++;
}
/* if requested, sort the "interesting" processes */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
