d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the 'C' field for a running thread to match the behavior described

Browse Source 
in the manpage by having it display the current CPU (ki_oncpu) rather
than the previously used CPU (ki_lastcpu).  ki_lastcpu is still used for
all other thread states.

Reported by:	Chris Ross <cross+freebsd@distal.com>
MFC after:	1 week
This commit is contained in:
John Baldwin 2013-03-11 16:33:05 +00:00
parent 2a75563d4a
commit ee66c8b94e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/top/machine.c
View File

@ -797,7 +797,7 @@ format_next_process(caddr_t handle, char *(*get_userid)(int), int flags)
double pct;
struct handle *hp;
char status[16];
int state;
int cpu, state;
struct rusage ru, *rup;
long p_tot, s_tot;
char *proc_fmt, thr_buf[6], jid_buf[6];
@ -997,6 +997,13 @@ format_next_process(caddr_t handle, char *(*get_userid)(int), int flags)
}
/* format this entry */
if (smpmode) {
if (state == SRUN && pp->ki_oncpu != 0xff)
cpu = pp->ki_oncpu;
else
cpu = pp->ki_lastcpu;
} else
cpu = 0;
proc_fmt = smpmode ? smp_Proc_format : up_Proc_format;
if (ps.thread != 0)
thr_buf[0] = '\0';
@ -1014,7 +1021,7 @@ format_next_process(caddr_t handle, char *(*get_userid)(int), int flags)
format_k2(PROCSIZE(pp)),
format_k2(pagetok(pp->ki_rssize)),
status,
smpmode ? pp->ki_lastcpu : 0,
cpu,
format_time(cputime),
ps.wcpu ? 100.0 * weighted_cpu(pct, pp) : 100.0 * pct,
screen_width > cmdlengthdelta ? screen_width - cmdlengthdelta : 0,