From nobody Thu Feb 27 00:51:39 2025 X-Original-To: dev-commits-src-all@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 4Z3CTR5zGkz5pKjR; Thu, 27 Feb 2025 00:51:39 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z3CTR5Jp6z3glm; Thu, 27 Feb 2025 00:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740617499; 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=m85gEVlXRIxd3lIxL4yHaw515ojrbTnCEAfMpaxrv24=; b=aWq7ocGb+8L0e/bOtLk1DRIruYA9akmv2z1c7KjnNDN8QsGsBBmkNBCrnXdUFxCkMDlMl1 7PWhvzajzvJN9MjitakMZy7mQ5w2uhnV/042ZL8UWSPU+zE0DSUna9UaV8NxusxLy/LAzp 4Apg6eTE6fIzSEaKAtxjd2sED4Xc/WJrDKlqieEd4PiVwwK0xIkP1l33StybCTqKzfcVwI kYwwseeyE4LZbset+2nvV1pOE5Wd7OT6cIypNlqHS0tDVknSfi3OFzyh9ToS+XlypVaVC/ cml5htUntTCvb5d9PW8kIFgLOIz0+Yy0rGZ20PamRtWaZk4nXUYiC05qxgEpMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740617499; a=rsa-sha256; cv=none; b=jo+7VsWIApIr9MHMUhQAEREixRKs4qj7EKmy6lkbTlZmDGAXzF8eLRsmvJq6BEwbNr4bes XtCNFTXG1usMg1VWQAm4bCCKrJgigXcOxoXt8yB/YwWYfsqpTMHLeO8yE/ubwiXL8rwobc 2uI135KLWIiY31ZyRNbyNpGpffnE/JHBRUkcXVMWxR4lBX9PsOuhpOtpK18rHppOenpWTW o2vdUAVbkK/Mr3wXyYgzjUt/DMvcUNDM2HE+GU4aUkn4NMNhbuV88k8Pu/c3RgPpabCk0h R1xFU2ym6HrzN51Nt3aHX6AxFo7PtO0m2/lUQ0Eba2uX1gLDRAkTL/6vglxUkw== 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=1740617499; 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=m85gEVlXRIxd3lIxL4yHaw515ojrbTnCEAfMpaxrv24=; b=tSw5YZxArFCThxDTtMWyN1JFIAnoj+lEcDzthUZi+Q1OJxyZnNf1nN36roRVNVhjpuSw7U 9lvEiHVV3ADD0gfmxMqtTf1FM/EQircoKJl0ZKosYKN5EwuQcT+xvJFzRfD4Q3FT7ic/wI IdeQrkcwfFSZonwhwVVzDBqwPGCk68JnHMHWq8aWP/4K7HFmOrdFlBl7ifLjEbwmXIRoU/ cYCuvHMztlh04Q6ctYIi8Slx7rtMwtHi2tz0IYdb7+1lCWZAuO59eRlFDPvTu7kEFFIOC1 5QuU1S/UUlxNcQmR1lNO2ji4oFc4IFGVNf4QUjlBnnhm5D5y5/fqhmTYI11FwQ== 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 4Z3CTR4Qnxz5Cr; Thu, 27 Feb 2025 00:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51R0pdpb011525; Thu, 27 Feb 2025 00:51:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51R0pd1D011522; Thu, 27 Feb 2025 00:51:39 GMT (envelope-from git) Date: Thu, 27 Feb 2025 00:51:39 GMT Message-Id: <202502270051.51R0pd1D011522@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 1ff76f6ddefa - stable/14 - gstat: Sync usage/synopsis + tag SPDX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ff76f6ddefa66d9b37c6781943db143f0e2d29c Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1ff76f6ddefa66d9b37c6781943db143f0e2d29c commit 1ff76f6ddefa66d9b37c6781943db143f0e2d29c Author: Alexander Ziaee AuthorDate: 2025-02-03 02:15:26 +0000 Commit: Alexander Ziaee CommitDate: 2025-02-27 00:51:00 +0000 gstat: Sync usage/synopsis + tag SPDX Sort options using the slightly unusual convention used here as well. MFC after: 3 days Approved by: carlavilla (mentor), imp (src) Differential Revision: https://reviews.freebsd.org/D48800 (cherry picked from commit 8b35839346d0bd8d4244018489bfdef8fd48de53) --- usr.sbin/gstat/gstat.8 | 17 ++++++++++------- usr.sbin/gstat/gstat.c | 8 ++++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/usr.sbin/gstat/gstat.8 b/usr.sbin/gstat/gstat.8 index d328d26be23c..02dbbbc54a3d 100644 --- a/usr.sbin/gstat/gstat.8 +++ b/usr.sbin/gstat/gstat.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2003 Giorgos Keramidas .\" All rights reserved. .\" @@ -22,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 1, 2021 +.Dd February 1, 2025 .Dt GSTAT 8 .Os .Sh NAME @@ -30,7 +33,7 @@ .Nd print statistics about GEOM disks .Sh SYNOPSIS .Nm -.Op Fl abBcdops +.Op Fl abBcCdops .Op Fl f Ar filter .Op Fl I Ar interval .Sh DESCRIPTION @@ -75,11 +78,6 @@ Only devices with the names matching will be displayed. The format of the regular expression is described in .Xr re_format 7 . -.It Fl o -Enable display of statistics for other operations -.Pq Dv BIO_FLUSH . -.It Fl s -Enable blocks' size statistics. .It Fl I Ar interval Refresh the .Nm @@ -92,8 +90,13 @@ or .Cm us (the default) indicates that the update interval is specified in seconds, milliseconds, or microseconds, respectively. +.It Fl o +Enable display of statistics for other operations +.Pq Dv BIO_FLUSH . .It Fl p Only display physical providers (those with rank of 1). +.It Fl s +Enable blocks' size statistics. .El .Sh INTERACTIVE COMMANDS These commands are currently recognized if diff --git a/usr.sbin/gstat/gstat.c b/usr.sbin/gstat/gstat.c index 887ae9dbee16..c650f7120a40 100644 --- a/usr.sbin/gstat/gstat.c +++ b/usr.sbin/gstat/gstat.c @@ -141,9 +141,6 @@ main(int argc, char **argv) "Invalid filter - see re_format(7)"); strlcpy(f_s, optarg, sizeof(f_s)); break; - case 'o': - flag_o = 1; - break; case 'I': p = NULL; i = strtoul(optarg, &p, 0); @@ -158,6 +155,9 @@ main(int argc, char **argv) i *= 1; flag_I = i; break; + case 'o': + flag_o = 1; + break; case 'p': flag_p = 1; break; @@ -615,7 +615,7 @@ out: static void usage(void) { - fprintf(stderr, "usage: gstat [-abBcCdps] [-f filter] [-I interval]\n"); + fprintf(stderr, "usage: gstat [-abBcCdops] [-f filter] [-I interval]\n"); exit(EX_USAGE); /* NOTREACHED */ }