From nobody Tue Aug 29 17:24:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RZvRP2Z8mz4s1dh; Tue, 29 Aug 2023 17:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RZvRP214Xz4Dpq; Tue, 29 Aug 2023 17:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693329841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fj5dp5kf+fGA9EsJ0TNqz/W++KJnaEGN8Gj+XuraxZ0=; b=rJk9st9m4An/Fgto02FKAfz0MYe1IwcGypdvUVuc+wfJuCjA2kWbX6FLsdTuDVECfhNtI6 F9Cg8MLlYDJ/SrlweUvxymbF96YOKeCYfsFs2gKpQz96V4N97sFGwzC2CoIDnFTcL5gD/p I1DXJBPD/X9la9Ykkeq4aMepfKByUTkYkn7KB5dk/1PNYr94vBOaaCTiKmSXyawvXGdDqr oXZ8KKUXTYf3QT4xL/HMc1W58OPipbRQoq1so5jIWKTmDyNS6+oStj/O0Bz5ZnK2EiyOPU IVoW/37wnuIZQ8vRTaMy7TxizEJOcfrY3wf4iauTfDr+n/W1gLR1PWfIvlXvYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693329841; a=rsa-sha256; cv=none; b=g/QHq+7YS3AK4+WqPp5VaAVQgdaPYLbYLL3XRYHzq+psny9cyvcPW8MX4PaDlPLkV3hyGv hZ5NEvTGXFwro27swPKkY1MBPklBktYspTL21NDTv/ykwNEEuJe6qFjWSxkaO8+tNZJc0W AedM5la46WdQwK1hucwO0AbgZVdTEdXx5W3A+i/9+mTKkgywWKTDyu0yAloZHWGrPWh0d3 E0L0kGSgaipV4/WL8xzh8TriBfarENpRP2qYEKlYeZyofUoCLb33yfOp1VGdCyRCmnfkhx OHN8BMjX3PCXIus+xejf6Bos3GC+/7BHXsvqQkqFyqsnA22whf0A4wyD1JyKxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693329841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fj5dp5kf+fGA9EsJ0TNqz/W++KJnaEGN8Gj+XuraxZ0=; b=kztdAv1K2S3on8BxsTmpXXsyTKZUnrlBvRxVHUjE2ZuqyAACaiInOgYkciGHyT1Fve87UZ szYk8JH5idY272WkkQVSkGUBycb+1izbaqsOHQzvWMmsHz25TewYiZPvik3ZKkPpBGWVut IsUGwPRj3aoAfwTXkcZn62LaMXb0WoDHOAS+ahGm6wKe9V5gdM5CC955Nw0+xFfIJH2vWZ WdLvGLubA4/B6cdsf3fnvVrghXRJ0zsEWuZiuv+pdUiB/4jFjlws0vK1t6XOgGo5wEKmgi kgZrHnB6F5NGD5u9NJPD1lj9F5eKpx8CLFChSfH6HKXFEn0425erhLSHUYLNDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RZvRP0mGlz116n; Tue, 29 Aug 2023 17:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37THO1vR056780; Tue, 29 Aug 2023 17:24:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37THO1wj056777; Tue, 29 Aug 2023 17:24:01 GMT (envelope-from git) Date: Tue, 29 Aug 2023 17:24:01 GMT Message-Id: <202308291724.37THO1wj056777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 09c45b089d2f - main - iostat: getopt() / usage() cleanup. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09c45b089d2f90ec04153a1b4621dd6bec142959 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=09c45b089d2f90ec04153a1b4621dd6bec142959 commit 09c45b089d2f90ec04153a1b4621dd6bec142959 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-29 17:23:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-29 17:23:23 +0000 iostat: getopt() / usage() cleanup. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D41636 --- usr.sbin/iostat/iostat.8 | 40 +++++++++++++++++++--------------------- usr.sbin/iostat/iostat.c | 24 ++++++++++++------------ 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8 index 17b73f0932c7..863f8ab8466c 100644 --- a/usr.sbin/iostat/iostat.8 +++ b/usr.sbin/iostat/iostat.8 @@ -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 diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c index 17013b433917..d4f7a2519a1b 100644 --- a/usr.sbin/iostat/iostat.c +++ b/usr.sbin/iostat/iostat.c @@ -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);