From nobody Sat May 28 23:28:14 2022 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 BA3DA1B3F242; Sat, 28 May 2022 23:28:14 +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 4L9dC24dHDz3P2l; Sat, 28 May 2022 23:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653780494; 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=yMj3vy7wqv2FvlketOL2iIQdSJdsKoH3r9DO4M1yZJo=; b=xg7LZRuWbr58agXtQVkA5gle83ljQvjWqQ0GwdQ3rOI+F/craJyXtjoA4k2I4RrY1YYJPy +4pTuMtAtJTo2ZHMgzWUb0bafqJ4sNuCQoX97+Ev6V/vR5udPa0VMHYnll8dbzOpT1yzjT df74txb7nz0UN6bDdfSrpRbPdryW4+Q4aCrY8KQSiUeOJji0UYhu9hpYRFuSw+wmMktmlk n+XH87WzMdUzPIpx5MtDNr2f3y5xTiEu6MP1pErRyxPMRE29W2GpNcOK7gh1fK1Ukg4EnA GZRMiuRN3KoIwapsJ0VVh9L++h9R/vLFS5q+tGnRYhmnuTCccPDJ3nkHEUtocg== 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 7AFCA17FCF; Sat, 28 May 2022 23:28:14 +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 24SNSEZO002819; Sat, 28 May 2022 23:28:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24SNSE4V002818; Sat, 28 May 2022 23:28:14 GMT (envelope-from git) Date: Sat, 28 May 2022 23:28:14 GMT Message-Id: <202205282328.24SNSE4V002818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: d92dc803f699 - main - nfsstat: Add an entry to output NFSPROC_APPENDWRITE count 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d92dc803f699c76873220e3fcb87940007be7d1b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653780494; 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=yMj3vy7wqv2FvlketOL2iIQdSJdsKoH3r9DO4M1yZJo=; b=g/jbOIPFS/idgWEAR6RTUWu0PFi6c8S4eqbFO0joBpI0Nwz0uUTyleML3JI3HU4oEYF9Jg C/fmbN1yBwsZx4rHRUEH7I+DxHVEKp+lzfWiZmtpypfsrl8/O+5J2/AYindJcnDFkcGVne OWcUbTRglsZ4vnkiwKGxSDEdRrjhQti47gUcU4LavFp9X1Z6p1iSpZk9UfdJwHvr92QkkL zkOwNxeT2VU1x3upICk5+zJuroe6iVi5GGueOOIw7S7SV47es2sA8MCNZkMoZ68j0HGpHk CmfJ+qgsxpXny47x+yHEzQzuntCDT5QxeKow2j3DWPPVJdfSG4wwB0gWrCJvGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653780494; a=rsa-sha256; cv=none; b=PK/SzQaquWPEFthVq7edrehAFpBYu7egP3+CMy+7oUucg6KEgRG5hnS5K6KVMojwTTxWat k8XFw98dE4enfjYYatjhQ6fY9wURaRxqumzHvg9V4MC/czjc3v53LsHWMVGDHXon8DHyc+ Nzwhx8kbW7FD/Piifu0gbjbmHmzmDfsoxOvq1/haT58SgQBjF0C6bU78FHxawBjtDEpWy2 JORMNgB/SjPIAMDFbzhjxJttv94n3GvsrBb2OAJ7SGZgeO2zUoxmnZ4eYrGLuLCVgOBuJ/ zUo/MOGtEqlaDG1n5CSriaYNZknAdO2gy9kmLYCAkmNx+a8SdM+BoJ422E1xmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=d92dc803f699c76873220e3fcb87940007be7d1b commit d92dc803f699c76873220e3fcb87940007be7d1b Author: Rick Macklem AuthorDate: 2022-05-28 23:27:02 +0000 Commit: Rick Macklem CommitDate: 2022-05-28 23:27:02 +0000 nfsstat: Add an entry to output NFSPROC_APPENDWRITE count Commit 5218d82c81f9 added a new NFSv4.1/4.2 procedure called AppendWrite that uses a Verify to avoid a separate Getattr RPC for the common case where the client knows the correct file size for O_APPEND writes. This patch modifies nfsstat so that it displays a count of these new RPCs for the "-E -c" option. --- usr.bin/nfsstat/nfsstat.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index da075d57c52e..37bec0daa9ac 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -750,13 +750,16 @@ exp_intpr(int clientOnly, int serverOnly, int nfs41) (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_COMMITDS]); xo_emit("{T:OpenLayout/%13.13s}{T:CreateLayout/%13.13s}" - "{T:BindConnSess/%13.13s}{T:LookupOpen/%13.13s}\n"); + "{T:BindConnSess/%13.13s}{T:LookupOpen/%13.13s}" + "{T:AppendWrite/%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_BINDCONNTOSESS], - (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_LOOKUPOPEN]); + "{:bindconnsess/%13ju}{:lookupopen/%13ju}" + "{:appendwrite/%13ju}\n", + (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_OPENLAYGET], + (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_CREATELAYGET], + (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_BINDCONNTOSESS], + (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_LOOKUPOPEN], + (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_APPENDWRITE]); xo_close_container("nfsv41");