From nobody Fri Jan 19 20:24:20 2024 X-Original-To: dev-commits-src-branches@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 4TGrgS3zYtz57KqD; Fri, 19 Jan 2024 20:24:20 +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 4TGrgS33NRz41hm; Fri, 19 Jan 2024 20:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705695860; 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=0AL0y1Ns52byR70LOnxXD34EaUShbYMZ6s896Q5fgjs=; b=VhTX/MHy6XTQ1t4kT4rzqfFXepnBPgXzUuf79V+05eoGNAe9OsAi0FweMgzi380dNUfn84 WEDrGqoe6tdWVzBavmDRdeAa6tW9oK62SP5Oa8tk0RdfItd3I3cuEYXR4TRLa2LOg+6TGE rdNiQMcYN4jdm35nF5fJ4yUCQEHtn2n8F5MrTDFDfBUn9NdZxH/4FW2u0kH96tTbKCkTHT 9X4K5RoFabjVSr2P0FRpoeP3kKQlTCifNST2LEo/V6R+eeHHzHX5fLIEauVl5Rs15Uvj2F 6aE6pCumsF5x61/vnVVdgag+E7z7/sDycgd1Lac8nEJzeBPw7RhR48gG5cbmxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705695860; 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=0AL0y1Ns52byR70LOnxXD34EaUShbYMZ6s896Q5fgjs=; b=Nj8uoV6ZQ8b1Qao3BHFgS1FK6QapxcrLll/wT3+ObT9NZhl2oQ9aKdFWB6iQyITIwFIpmD rv5jcqP8KQRHLlPTrV48HXj/v9CiRzoCMtied3LWeUcunhdujFPOZ8jnLCRcVONxR+Dh56 hEY3fjbVPYSfIu2d7S4IgXrcDDpQaSvJ2DRcDVX1oozZ62gN80//tOMseUjqzOlVluzuf2 2QHVJ6MmdnGoeIlkQl0SVdvwLFczKX/osaVJIfo5u1CRfosWnDmEeykQfOxU45FTl6hUa1 2aVN6fuKm1ftt2uY2rWBsfaPSG7evHaJGvPTn+Nf+MR5Ohk6epD08bFTO8r96g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705695860; a=rsa-sha256; cv=none; b=ktJJajF42FNXpUoefFzMtaUEMGd3CpitkJ8JvOJY4Sw/IpYTH8iCc0vn6fKK6iVQtoQZ5E yOdoSmq+11f1sGOg7kwRS1KYN7v0JHzeXSFRFk+gZ3S1mRJWGh7UqMof0rJJxp1fnsaHSR KhquEMAewoC+2+OXwsG5lHJkXViiD5pU4OLZzz1Hq+4tHsPR7/nbxdAZi/0LFatiyvK7Ks YSRqmAp21JgSj02wzg+SdJZtHxNhQOM37Dy1S76vVaTpPZXj/hMKfkZ5o9lHX0BPaunH4U RhAflk9oOl/YjvFA9EJvcB4T7fPjHEGS3Yr4xZ195BPZ35yAERyeaSmVdTxLDg== 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 4TGrgS277Qz15XR; Fri, 19 Jan 2024 20:24:20 +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 40JKOKF1017261; Fri, 19 Jan 2024 20:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40JKOK7l017258; Fri, 19 Jan 2024 20:24:20 GMT (envelope-from git) Date: Fri, 19 Jan 2024 20:24:20 GMT Message-Id: <202401192024.40JKOK7l017258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1726e4ced900 - stable/13 - nfsstat: make -q work without -e/-E List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1726e4ced9009b516bdb276234718489c1a0e05f Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1726e4ced9009b516bdb276234718489c1a0e05f commit 1726e4ced9009b516bdb276234718489c1a0e05f Author: Lexi Winter AuthorDate: 2023-12-28 12:56:57 +0000 Commit: Alan Somers CommitDate: 2024-01-19 20:23:42 +0000 nfsstat: make -q work without -e/-E Pull Request: https://github.com/freebsd/freebsd-src/pull/961 (cherry picked from commit f79b200b6aefb9bdcbe931c5b7ea604e259beee0) --- usr.bin/nfsstat/nfsstat.1 | 4 ++-- usr.bin/nfsstat/nfsstat.c | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1 index f51e2662636d..200b2fc2f6ef 100644 --- a/usr.bin/nfsstat/nfsstat.1 +++ b/usr.bin/nfsstat/nfsstat.1 @@ -27,7 +27,7 @@ .\" .\" From: @(#)nfsstat.1 8.1 (Berkeley) 6/6/93 .\" -.Dd December 27, 2023 +.Dd December 28, 2023 .Dt NFSSTAT 1 .Os .Sh NAME @@ -119,7 +119,7 @@ second intervals. .It Fl z Reset statistics after displaying them. .It Fl q -Do not print header +Do not print headers. .It Fl -libxo Generate output via .Xr libxo 3 diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index e7e9850eb943..ebe1e21cccc5 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -282,7 +282,8 @@ intpr(int clientOnly, int serverOnly) xo_emit("{T:Client Info:\n"); xo_open_container("operations"); - xo_emit("{T:Rpc Counts:}\n"); + if (printtitle) + xo_emit("{T:Rpc Counts:}\n"); xo_emit("{T:Getattr/%13.13s}{T:Setattr/%13.13s}" "{T:Lookup/%13.13s}{T:Readlink/%13.13s}" @@ -333,7 +334,8 @@ intpr(int clientOnly, int serverOnly) xo_close_container("operations"); xo_open_container("rpcs"); - xo_emit("{T:Rpc Info:}\n"); + if (printtitle) + xo_emit("{T:Rpc Info:}\n"); xo_emit("{T:TimedOut/%13.13s}{T:Invalid/%13.13s}" "{T:X Replies/%13.13s}{T:Retries/%13.13s}" @@ -349,7 +351,8 @@ intpr(int clientOnly, int serverOnly) xo_close_container("rpcs"); xo_open_container("cache"); - xo_emit("{T:Cache Info:}\n"); + if (printtitle) + xo_emit("{T:Cache Info:}\n"); xo_emit("{T:Attr Hits/%13.13s}{T:Attr Misses/%13.13s}" "{T:Lkup Hits/%13.13s}{T:Lkup Misses/%13.13s}" @@ -396,7 +399,8 @@ intpr(int clientOnly, int serverOnly) if (serverOnly) { xo_open_container("serverstats"); - xo_emit("{T:Server Info:}\n"); + if (printtitle) + xo_emit("{T:Server Info:}\n"); xo_open_container("operations"); xo_emit("{T:Getattr/%13.13s}{T:Setattr/%13.13s}" @@ -449,7 +453,8 @@ intpr(int clientOnly, int serverOnly) xo_open_container("server"); - xo_emit("{T:Server Write Gathering:/%13.13s}\n"); + if (printtitle) + xo_emit("{T:Server Write Gathering:/%13.13s}\n"); xo_emit("{T:WriteOps/%13.13s}{T:WriteRPC/%13.13s}" "{T:Opsaved/%13.13s}\n"); @@ -465,7 +470,8 @@ intpr(int clientOnly, int serverOnly) xo_close_container("server"); xo_open_container("cache"); - xo_emit("{T:Server Cache Stats:/%13.13s}\n"); + if (printtitle) + xo_emit("{T:Server Cache Stats:/%13.13s}\n"); xo_emit("{T:Inprog/%13.13s}" "{T:Non-Idem/%13.13s}{T:Misses/%13.13s}\n"); xo_emit("{:inprog/%13ju}{:nonidem/%13ju}{:misses/%13ju}\n",