mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-28 08:02:54 +00:00
Code Issues Releases Activity

iostat: getopt() / usage() cleanup.

Browse Source 
MFC after:	1 week
Sponsored by:	Klara, Inc.
Reviewed by:	allanjude
Differential Revision:	https://reviews.freebsd.org/D41636
This commit is contained in:
Dag-Erling Smørgrav 2023-08-29 17:23:23 +00:00
parent 28977cb9bc
commit 09c45b089d
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
usr.sbin/iostat/iostat.8
View File

@ -54,7 +54,7 @@
.\"
.\" @(#)iostat.8 8.1 (Berkeley) 6/6/93
.\"
.Dd May 22, 2015
.Dd August 29, 2023
.Dt IOSTAT 8
.Os
.Sh NAME
@ -64,7 +64,7 @@
statistics
.Sh SYNOPSIS
.Nm
.Op Fl CdhIKoTxz?\&
.Op Fl CdhIKoTxz
.Op Fl c Ar count
.Op Fl M Ar core
.Op Fl n Ar devs
@ -90,6 +90,13 @@ averaged over that time.
.Pp
The options are as follows:
.Bl -tag -width flag
.It Fl C
Display CPU statistics.
This is on by default, unless
.Fl d
or
.Fl x
is specified.
.It Fl c
Repeat the display
.Ar count
@ -102,13 +109,6 @@ is specified.
With
.Fl w
the default repeat count is infinity, otherwise it is 1.
.It Fl C
Display CPU statistics.
This is on by default, unless
.Fl d
or
.Fl x
is specified.
.It Fl d
Display only device statistics.
If this flag is turned on, only device statistics will be displayed, unless
@ -136,6 +136,9 @@ then the device native block size.
Extract values associated with the name list from the specified core
instead of the default
.Dq Pa /dev/kmem .
.It Fl N
Extract the name list from the specified system instead of the default
.Dq Pa /boot/kernel/kernel .
.It Fl n
Display up to
.Ar devs
@ -145,9 +148,6 @@ The
utility will display fewer devices if there are not
.Ar devs
devices present.
.It Fl N
Extract the name list from the specified system instead of the default
.Dq Pa /boot/kernel/kernel .
.It Fl o
Display old-style
.Nm
@ -158,6 +158,13 @@ If
.Fl I
is specified, total blocks/sectors, total transfers, and
milliseconds per seek are displayed.
.It Fl T
Display TTY statistics.
This is on by default, unless
.Fl d
or
.Fl x
is specified.
.It Fl t
Specify which types of devices to display.
There are three different categories of devices:
@ -228,13 +235,6 @@ argument will be included in the
.Nm
output, up to the number of devices that can be displayed in
80 columns, or the maximum number of devices specified by the user.
.It Fl T
Display TTY statistics.
This is on by default, unless
.Fl d
or
.Fl x
is specified.
.It Fl w
Pause
.Ar wait
@ -267,8 +267,6 @@ is also specified to enable the display of CPU or TTY statistics.
If
.Fl x
is specified, omit lines for devices with no activity.
.It Fl ?\&
Display a usage statement and exit.
.El
.Pp
The

24
usr.sbin/iostat/iostat.c
View File

@ -168,7 +168,7 @@ usage(void)
* This isn't mentioned in the man page, or the usage statement,
* but it is supported.
*/
fprintf(stderr, "usage: iostat [-CdhIKoTxz?] [-c count] [-M core]"
fprintf(stderr, "usage: iostat [-CdhIKoTxz] [-c count] [-M core]"
" [-n devs] [-N system]\n"
"\t [-t type,if,pass] [-w wait] [drives]\n");
exit(1);
@ -198,17 +198,17 @@ main(int argc, char **argv)
matches = NULL;
maxshowdevs = 3;
while ((c = getopt(argc, argv, "c:CdhIKM:n:N:ot:Tw:xz?")) != -1) {
switch(c) {
while ((c = getopt(argc, argv, "Cc:dhIKM:N:n:oTt:w:xz")) != -1) {
switch (c) {
case 'C':
Cflag++;
break;
case 'c':
cflag++;
count = atoi(optarg);
if (count < 1)
errx(1, "count %d is < 1", count);
break;
case 'C':
Cflag++;
break;
case 'd':
dflag++;
break;
@ -224,6 +224,9 @@ main(int argc, char **argv)
case 'M':
memf = optarg;
break;
case 'N':
nlistf = optarg;
break;
case 'n':
nflag++;
maxshowdevs = atoi(optarg);
@ -231,20 +234,17 @@ main(int argc, char **argv)
errx(1, "number of devices %d is < 0",
maxshowdevs);
break;
case 'N':
nlistf = optarg;
break;
case 'o':
oflag++;
break;
case 'T':
Tflag++;
break;
case 't':
if (devstat_buildmatch(optarg, &matches,
&num_matches) != 0)
errx(1, "%s", devstat_errbuf);
break;
case 'T':
Tflag++;
break;
case 'w':
wflag++;
f = atof(optarg);