Author: jhb
Date: Wed Feb 5 14:44:59 2014
New Revision: 261514
URL: http://svnweb.freebsd.org/changeset/base/261514
Log:
Use the DELTA() macro to tidy the server-side interval stats code a bit.
MFC after: 2 weeks
Modified:
head/usr.bin/nfsstat/nfsstat.c
Modified: head/usr.bin/nfsstat/nfsstat.c
==============================================================================
--- head/usr.bin/nfsstat/nfsstat.c Wed Feb 5 14:44:22 2014
(r261513)
+++ head/usr.bin/nfsstat/nfsstat.c Wed Feb 5 14:44:59 2014
(r261514)
@@ -1025,24 +1025,15 @@ exp_sidewaysintpr(u_int interval, int cl
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;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
