Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Sep 2019 20:14:21 +0000 (UTC)
From:      Rick Macklem <rmacklem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r351829 - stable/12/usr.bin/nfsstat
Message-ID:  <201909042014.x84KELnS054253@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rmacklem
Date: Wed Sep  4 20:14:21 2019
New Revision: 351829
URL: https://svnweb.freebsd.org/changeset/base/351829

Log:
  MFC: r350395
  Fix printing of Server Re-Failed and Server Faults.
  
  nfsstat -s prints bogus large numbers for the Server Re-Failed and Server
  Faults fields. This was introduced by r328588.
  Although I know nothing about libxo, these lines aren't titles and this
  patch seems to fix the problem, so I am committing it for rea@ who emailed
  it to me.
  It also deleted the trailing ':' from the title lines, since those were not
  in the pre-r328588 output.
  
  If there is a more correct fix, someone conversant with libxo will need
  to do so.

Modified:
  stable/12/usr.bin/nfsstat/nfsstat.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.bin/nfsstat/nfsstat.c
==============================================================================
--- stable/12/usr.bin/nfsstat/nfsstat.c	Wed Sep  4 20:08:36 2019	(r351828)
+++ stable/12/usr.bin/nfsstat/nfsstat.c	Wed Sep  4 20:14:21 2019	(r351829)
@@ -460,11 +460,11 @@ intpr(int clientOnly, int serverOnly)
 		xo_close_container("operations");
 
 		xo_open_container("server");
-		xo_emit("{T:Server Re-Failed:}\n");
-		xo_emit("{T:retfailed/%17ju}\n", (uintmax_t)ext_nfsstats.srvrpc_errs);
+		xo_emit("{T:Server Re-Failed}\n");
+		xo_emit("{:retfailed/%16ju}\n", (uintmax_t)ext_nfsstats.srvrpc_errs);
 
-		xo_emit("{T:Server Faults:}\n");
-		xo_emit("{T:faults/%13ju}\n", (uintmax_t)ext_nfsstats.srv_errs);
+		xo_emit("{T:Server Faults}\n");
+		xo_emit("{:faults/%13ju}\n", (uintmax_t)ext_nfsstats.srv_errs);
 
 		xo_emit("{T:Server Write Gathering:/%13.13s}\n");
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909042014.x84KELnS054253>