git: 75c666197cc7 - main - nfsstat: Add output for counts of new RPCs to the "-E" option

The branch main has been updated by rmacklem:

URL: https://cgit.FreeBSD.org/src/commit/?id=75c666197cc7574f6f0d48344f8725f72072fc84

commit 75c666197cc7574f6f0d48344f8725f72072fc84
Author:     Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2021-11-14 21:36:14 +0000
Commit:     Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2021-11-14 21:36:14 +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).
    
    MFC after:      2 weeks
---
 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)