[Midnightbsd-cvs] src [11464] trunk/usr.bin/nfsstat/nfsstat.c: fixup nfsstat

[laffer1 at midnightbsd.org]

Revision: 11464
          http://svnweb.midnightbsd.org/src/?rev=11464
Author:   laffer1
Date:     2018-07-07 12:53:24 -0400 (Sat, 07 Jul 2018)
Log Message:
-----------
fixup nfsstat

Modified Paths:
--------------
    trunk/usr.bin/nfsstat/Makefile
    trunk/usr.bin/nfsstat/nfsstat.1
    trunk/usr.bin/nfsstat/nfsstat.c

Property Changed:
----------------
    trunk/usr.bin/nfsstat/nfsstat.1

Modified: trunk/usr.bin/nfsstat/Makefile
===================================================================
--- trunk/usr.bin/nfsstat/Makefile	2018-07-07 16:52:55 UTC (rev 11463)
+++ trunk/usr.bin/nfsstat/Makefile	2018-07-07 16:53:24 UTC (rev 11464)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/nfsstat/Makefile 201386 2010-01-02 10:27:05Z ed $
 
 PROG=	nfsstat
 CFLAGS+=-DNFS

Modified: trunk/usr.bin/nfsstat/nfsstat.1
===================================================================
--- trunk/usr.bin/nfsstat/nfsstat.1	2018-07-07 16:52:55 UTC (rev 11463)
+++ trunk/usr.bin/nfsstat/nfsstat.1	2018-07-07 16:53:24 UTC (rev 11464)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -26,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsstat.1	8.1 (Berkeley) 6/6/93
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/nfsstat/nfsstat.1 250158 2013-05-01 22:16:29Z rmacklem $
 .\"
 .Dd May 1, 2013
 .Dt NFSSTAT 1


Property changes on: trunk/usr.bin/nfsstat/nfsstat.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/nfsstat/nfsstat.c
===================================================================
--- trunk/usr.bin/nfsstat/nfsstat.c	2018-07-07 16:52:55 UTC (rev 11463)
+++ trunk/usr.bin/nfsstat/nfsstat.c	2018-07-07 16:53:24 UTC (rev 11464)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 1983, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,7 +42,7 @@
 static char sccsid[] = "@(#)nfsstat.c	8.2 (Berkeley) 3/31/95";
 #endif
 static const char rcsid[] =
-  "$MidnightBSD$";
+  "$FreeBSD: stable/10/usr.bin/nfsstat/nfsstat.c 262229 2014-02-19 19:28:49Z jhb $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -133,6 +134,9 @@
 						printf("%s on %s\n%s\n",
 						    mntbuf->f_mntfromname,
 						    mntbuf->f_mntonname, buf);
+					else if (errno == EPERM)
+						errx(1, "Only priviledged users"
+						    " can use the -m option");
 				}
 				mntbuf++;
 			}
@@ -601,14 +605,15 @@
 		if (clientOnly) {
 		    printf("%s %6d %6d %6d %6d %6d %6d %6d %6d",
 			((clientOnly && serverOnly) ? "Client:" : ""),
-			DELTA(attrcache_hits) + DELTA(attrcache_misses),
-			DELTA(lookupcache_hits) + DELTA(lookupcache_misses),
-			DELTA(biocache_readlinks),
-			DELTA(biocache_reads),
-			DELTA(biocache_writes),
-			nfsstats.rpccnt[NFSPROC_RENAME]-lastst.rpccnt[NFSPROC_RENAME],
-			DELTA(accesscache_hits) + DELTA(accesscache_misses),
-			DELTA(biocache_readdirs)
+			DELTA(rpccnt[NFSPROC_GETATTR]),
+			DELTA(rpccnt[NFSPROC_LOOKUP]),
+			DELTA(rpccnt[NFSPROC_READLINK]),
+			DELTA(rpccnt[NFSPROC_READ]),
+			DELTA(rpccnt[NFSPROC_WRITE]),
+			DELTA(rpccnt[NFSPROC_RENAME]),
+			DELTA(rpccnt[NFSPROC_ACCESS]),
+			DELTA(rpccnt[NFSPROC_READDIR]) +
+			DELTA(rpccnt[NFSPROC_READDIRPLUS])
 		    );
 		    if (widemode) {
 			    printf(" %s %s %s %s %s %s",
@@ -990,15 +995,15 @@
 		if (clientOnly) {
 		    printf("%s %6d %6d %6d %6d %6d %6d %6d %6d",
 			((clientOnly && serverOnly) ? "Client:" : ""),
-			DELTA(attrcache_hits) + DELTA(attrcache_misses),
-			DELTA(lookupcache_hits) + DELTA(lookupcache_misses),
-			DELTA(biocache_readlinks),
-			DELTA(biocache_reads),
-			DELTA(biocache_writes),
-			nfsstats.rpccnt[NFSPROC_RENAME] -
-			lastst.rpccnt[NFSPROC_RENAME],
-			DELTA(accesscache_hits) + DELTA(accesscache_misses),
-			DELTA(biocache_readdirs)
+			DELTA(rpccnt[NFSPROC_GETATTR]),
+			DELTA(rpccnt[NFSPROC_LOOKUP]),
+			DELTA(rpccnt[NFSPROC_READLINK]),
+			DELTA(rpccnt[NFSPROC_READ]),
+			DELTA(rpccnt[NFSPROC_WRITE]),
+			DELTA(rpccnt[NFSPROC_RENAME]),
+			DELTA(rpccnt[NFSPROC_ACCESS]),
+			DELTA(rpccnt[NFSPROC_READDIR]) +
+			DELTA(rpccnt[NFSPROC_READDIRPLUS])
 		    );
 		    if (widemode) {
 			    printf(" %s %s %s %s %s %s",
@@ -1017,32 +1022,22 @@
 			    );
 		    }
 		    printf("\n");
-		    lastst = nfsstats;
 		}
 		if (serverOnly) {
 		    printf("%s %6d %6d %6d %6d %6d %6d %6d %6d",
 			((clientOnly && serverOnly) ? "Server:" : ""),
-			nfsstats.srvrpccnt[NFSV4OP_GETATTR] -
-			lastst.srvrpccnt[NFSV4OP_GETATTR],
-			nfsstats.srvrpccnt[NFSV4OP_LOOKUP] -
-			lastst.srvrpccnt[NFSV4OP_LOOKUP],
-			nfsstats.srvrpccnt[NFSV4OP_READLINK] -
-			lastst.srvrpccnt[NFSV4OP_READLINK],
-			nfsstats.srvrpccnt[NFSV4OP_READ] -
-			lastst.srvrpccnt[NFSV4OP_READ],
-			nfsstats.srvrpccnt[NFSV4OP_WRITE] -
-			lastst.srvrpccnt[NFSV4OP_WRITE],
-			nfsstats.srvrpccnt[NFSV4OP_RENAME] -
-			lastst.srvrpccnt[NFSV4OP_RENAME],
-			nfsstats.srvrpccnt[NFSV4OP_ACCESS] -
-			lastst.srvrpccnt[NFSV4OP_ACCESS],
-			(nfsstats.srvrpccnt[NFSV4OP_READDIR] -
-			 lastst.srvrpccnt[NFSV4OP_READDIR]) +
-			(nfsstats.srvrpccnt[NFSV4OP_READDIRPLUS] -
-			 lastst.srvrpccnt[NFSV4OP_READDIRPLUS]));
+			DELTA(srvrpccnt[NFSV4OP_GETATTR]),
+			DELTA(srvrpccnt[NFSV4OP_LOOKUP]),
+			DELTA(srvrpccnt[NFSV4OP_READLINK]),
+			DELTA(srvrpccnt[NFSV4OP_READ]),
+			DELTA(srvrpccnt[NFSV4OP_WRITE]),
+			DELTA(srvrpccnt[NFSV4OP_RENAME]),
+			DELTA(srvrpccnt[NFSV4OP_ACCESS]),
+			DELTA(srvrpccnt[NFSV4OP_READDIR]) +
+			DELTA(srvrpccnt[NFSV4OP_READDIRPLUS]));
 		    printf("\n");
-		    lastst = nfsstats;
 		}
+		lastst = nfsstats;
 		fflush(stdout);
 		sleep(interval);
 	}