Partially revert r52493 and change client side interval statistics to

report the actual number of RPCs issued, not the theoretical number
that would be issued if all caching was disabled.

Reviewed by:	rmacklem
MFC after:	2 weeks
This commit is contained in:
John Baldwin 2014-02-05 14:33:22 +00:00
parent b81e945b9b
commit 2fdfccfd7c
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=261512

View File

@ -604,14 +604,15 @@ sidewaysintpr(u_int interval, int clientOnly, int serverOnly)
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",
@ -993,15 +994,15 @@ exp_sidewaysintpr(u_int interval, int clientOnly, int serverOnly)
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",