From nobody Mon Nov 29 00:08:29 2021 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 20A7B18C616A; Mon, 29 Nov 2021 00:08:30 +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 4J2Qg150Vcz3Bs5; Mon, 29 Nov 2021 00:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 85E1A1886D; Mon, 29 Nov 2021 00:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AT08T7s015503; Mon, 29 Nov 2021 00:08:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AT08T2G015502; Mon, 29 Nov 2021 00:08:29 GMT (envelope-from git) Date: Mon, 29 Nov 2021 00:08:29 GMT Message-Id: <202111290008.1AT08T2G015502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: b61ed468809f - stable/13 - nfsstat: Add output for counts of new RPCs to the "-E" option 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b61ed468809f953adb2f885e1ec29f500c608087 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638144509; 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=2QRZbc2ObT9Q4H5eZUrriuuppmzv+fr/Iv5y5BnGoLc=; b=j4Cycekl1HE67w1zT0qRW54w7Lk+R7OT2yvpZaGqs5U85IOeFjDGmUjU9FjeGUil5+Janw wmIbBJk8Mc/rh0Vm8hzB2kzPPIbaUBP3On5OXGxdddrP9li6FGLhoT+Z+h+ETq2k6PnpyB BjVXOcf63DYzsN3sqgLrzMkXfiAFrBXcryiqIj8jAb66rRmps02NdpI6q+kHxfFHixVuJx BPP2bF5dbvGrLcCwxTtNsu4GCMJXv0QJKnd/393Chas3AxsplXVSVcVqXK15glurY+Jmr5 VYamOpE4hheB1FeyD8jEQSTo3qmADXO2yeiFJ6bJ3L+C8gR3QKrJ0M1Lf2texw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638144509; a=rsa-sha256; cv=none; b=rqljJ1sqbl1kQp0vfAAaj3gjKV4PAdR4S6HnWYbTRLAbtgBVcS+9qUfBxHQZqAxR/x9WD6 3+NmuAoJb6Rb+48vRbR/aWE3Z+yldDtMmTwkNlVktSowT4BuCERJ1EkwErM0B+/+HhyxT0 3E0sm2o3NMkgHNXJrbfK8msRDQjiHSLaTmaOy0CzjeZghIab9E8vmrkp38c0z6RpUskn8a JWl/oQH0nDx+mdSjYcWrBOKzjkE21ajUogFivVBsAzE1LEc3HDJ6XrpJDrYLyTuw2iPW0w U0VOpTElPK8kLpV9ltoznWN83aG9Yr8zhANoTjZ7mtC0QiYGI5bW/4KBXqWIXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b61ed468809f953adb2f885e1ec29f500c608087 commit b61ed468809f953adb2f885e1ec29f500c608087 Author: Rick Macklem AuthorDate: 2021-11-14 21:36:14 +0000 Commit: Rick Macklem CommitDate: 2021-11-28 23:58:03 +0000 nfsstat: Add output for counts of new RPCs to the "-E" option Add output to the "-E" option for new RPCs related to NFSv4.1/4.2. Also, add output of the counts for allocated layouts and the title for the "Client" section (which was lost during a previous commit). (cherry picked from commit 75c666197cc7574f6f0d48344f8725f72072fc84) --- usr.bin/nfsstat/nfsstat.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index e2d747634bcc..da075d57c52e 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -749,10 +749,14 @@ exp_intpr(int clientOnly, int serverOnly, int nfs41) (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_WRITEDS], (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_COMMITDS]); - xo_emit("{T:OpenLayout/%13.13s}{T:CreateLayout/%13.13s}\n"); - xo_emit("{:openlayout/%13ju}{:createlayout/%13ju}\n", + xo_emit("{T:OpenLayout/%13.13s}{T:CreateLayout/%13.13s}" + "{T:BindConnSess/%13.13s}{T:LookupOpen/%13.13s}\n"); + xo_emit("{:openlayout/%13ju}{:createlayout/%13ju}" + "{:bindconnsess/%13ju}{:lookupopen/%13ju}\n", (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_OPENLAYGET], - (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_CREATELAYGET]); + (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_CREATELAYGET], + (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_BINDCONNTOSESS], + (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_LOOKUPOPEN]); xo_close_container("nfsv41"); @@ -772,17 +776,23 @@ exp_intpr(int clientOnly, int serverOnly, int nfs41) (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_GETEXTATTR]); xo_emit("{T:SetExtattr/%13.13s}{T:RmExtattr/%13.13s}" - "{T:ListExtattr/%13.13s}\n"); + "{T:ListExtattr/%13.13s}{T:Deallocate/%13.13s}" + "{T:LayoutError/%13.13s}\n"); xo_emit("{:setextattr/%13ju}{:rmextattr/%13ju}" - "{:listextattr/%13ju}\n", + "{:listextattr/%13ju}{:deallocate/%13ju}" + "{:layouterror/%13ju}\n", (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_SETEXTATTR], (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_RMEXTATTR], - (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_LISTEXTATTR]); + (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_LISTEXTATTR], + (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_DEALLOCATE], + (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_LAYOUTERROR]); xo_close_container("nfsv42"); } xo_close_container("operations"); + if (printtitle) + xo_emit("{T:Client:}\n"); xo_open_container("client"); xo_emit("{T:OpenOwner/%13.13s}{T:Opens/%13.13s}" "{T:LockOwner/%13.13s}{T:Locks/%13.13s}" @@ -798,12 +808,13 @@ exp_intpr(int clientOnly, int serverOnly, int nfs41) (uintmax_t)ext_nfsstats.cllocalopenowners); xo_emit("{T:LocalOpen/%13.13s}{T:LocalLown/%13.13s}" - "{T:LocalLock/%13.13s}\n"); + "{T:LocalLock/%13.13s}{T:Layouts/%13.13s}\n"); xo_emit("{:localopen/%13ju}{:locallown/%13ju}" - "{:locallock/%13ju}\n", + "{:locallock/%13ju}{:layouts/%13ju}\n", (uintmax_t)ext_nfsstats.cllocalopens, (uintmax_t)ext_nfsstats.cllocallockowners, - (uintmax_t)ext_nfsstats.cllocallocks); + (uintmax_t)ext_nfsstats.cllocallocks, + (uintmax_t)ext_nfsstats.cllayouts); xo_close_container("client"); xo_open_container("rpc"); @@ -1061,6 +1072,9 @@ exp_intpr(int clientOnly, int serverOnly, int nfs41) (uintmax_t)ext_nfsstats.srvlockowners, (uintmax_t)ext_nfsstats.srvlocks, (uintmax_t)ext_nfsstats.srvdelegates); + xo_emit("{T:Layouts/%13.13s}\n"); + xo_emit("{:layouts/%13ju}\n", + (uintmax_t)ext_nfsstats.srvlayouts); xo_close_container("server"); if (printtitle)