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

Add a new option to toggle the display of the system idle process (per-CPU

Browse Source 
idle threads).  The process is displayed by default (subject to whether or
not system processes are displayed) to preserve existing behavior.  The
system idle process can be hidden via the '-z' command line argument or the
'z' key while top is running.  When it is hidden, top more closely matches
the behavior of FreeBSD <= 4.x where idle time was not accounted to any
process.

MFC after:	2 weeks
This commit is contained in:
John Baldwin 2011-05-31 15:11:23 +00:00
parent 06034940f5
commit c9385548e7
5 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/top/commands.c
View File

@ -94,6 +94,7 @@ S - toggle the displaying of system processes\n\
a - toggle the displaying of process titles\n\
t - toggle the display of this process\n\
u - display processes for only one user (+ selects all users)\n\
z - toggle the displaying of the system idle process\n\
\n\
\n", stdout);
}

1
contrib/top/machine.h
View File

@ -65,6 +65,7 @@ struct process_select
int uid; /* only this uid (unless uid == -1) */
int wcpu; /* show weighted cpu */
int jail; /* show jail ID */
int kidle; /* show per-CPU idle threads */
char *command; /* only this command (unless == NULL) */
};

8
contrib/top/top.X
View File

@ -10,7 +10,7 @@ top \- display and update information about the top cpu processes
.SH SYNOPSIS
.B top
[
.B \-abCHIijnPqStuv
.B \-abCHIijnPqStuvz
] [
.BI \-d count
] [
@ -142,6 +142,9 @@ Write version number information to stderr then exit immediately.
No other processing takes place when this option is used. To see current
revision information while top is running, use the help command \*(lq?\*(rq.
.TP
.B \-z
Do not display the system idle process.
.TP
.BI \-d count
Show only
.I count
@ -303,6 +306,9 @@ ID.
Toggle the display of the
.I top
process.
.TP
.B z
Toggle the display of the system idle process.
.SH "THE DISPLAY"
The actual display varies depending on the specific variant of Unix
that the machine is running. This description may not exactly match

24
contrib/top/top.c
View File

@ -196,9 +196,9 @@ char *argv[];
fd_set readfds;
#ifdef ORDER
static char command_chars[] = "\f qh?en#sdkriIutHmSCajo";
static char command_chars[] = "\f qh?en#sdkriIutHmSCajzo";
#else
static char command_chars[] = "\f qh?en#sdkriIutHmSCaj";
static char command_chars[] = "\f qh?en#sdkriIutHmSCajz";
#endif
/* these defines enumerate the "strchr"s of the commands in command_chars */
#define CMD_redraw 0
@ -224,8 +224,9 @@ char *argv[];
#define CMD_wcputog 19
#define CMD_showargs 20
#define CMD_jidtog 21
#define CMD_kidletog 22
#ifdef ORDER
#define CMD_order 22
#define CMD_order 23
#endif
/* set the buffer for stdout */
@ -258,6 +259,7 @@ char *argv[];
ps.thread = No;
ps.wcpu = 1;
ps.jail = No;
ps.kidle = Yes;
ps.command = NULL;
/* get preset options from the environment */
@ -283,7 +285,7 @@ char *argv[];
optind = 1;
}
while ((i = getopt(ac, av, "CSIHPabijnquvs:d:U:m:o:t")) != EOF)
while ((i = getopt(ac, av, "CSIHPabijnquvzs:d:U:m:o:t")) != EOF)
{
switch(i)
{
@ -412,10 +414,14 @@ char *argv[];
pcpu_stats = Yes;
break;
case 'z':
ps.kidle = !ps.kidle;
break;
default:
fprintf(stderr,
"Top version %s\n"
"Usage: %s [-abCHIijnPqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n"
"Usage: %s [-abCHIijnPqStuvz] [-d count] [-m io | cpu] [-o field] [-s time]\n"
" [-U username] [number]\n",
version_string(), myname);
exit(1);
@ -1075,7 +1081,13 @@ char *argv[];
reset_display();
putchar('\r');
break;
case CMD_kidletog:
ps.kidle = !ps.kidle;
new_message(MT_standout | MT_delayed,
" %sisplaying system idle process.",
ps.kidle ? "D" : "Not d");
putchar('\r');
break;
default:
new_message(MT_standout, " BAD CASE IN SWITCH!");
putchar('\r');

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

@ -624,6 +624,7 @@ get_process_info(struct system_info *si, struct process_select *sel,
int show_system;
int show_uid;
int show_command;
int show_kidle;
/*
* Save the previous process info.
@ -664,6 +665,7 @@ get_process_info(struct system_info *si, struct process_select *sel,
show_system = sel->system;
show_uid = sel->uid != -1;
show_command = sel->command != NULL;
show_kidle = sel->kidle;
/* count up process states and get pointers to interesting procs */
total_procs = 0;
@ -705,6 +707,11 @@ get_process_info(struct system_info *si, struct process_select *sel,
/* skip idle or non-running processes */
continue;
if (displaymode == DISP_CPU && !show_kidle &&
pp->ki_tdflags & TDF_IDLETD)
/* skip kernel idle process */
continue;
if (displaymode == DISP_IO && !show_idle && p_io == 0)
/* skip processes that aren't doing I/O */
continue;