d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nfsstat so that the "-z" option works for the

Browse Source 
new NFS subsystem.

MFC after:	2 weeks
This commit is contained in:
Rick Macklem 2011-05-01 23:41:35 +00:00
parent b1b9d50bd9
commit d380a59d3d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/nfsstat/nfsstat.c
View File

@ -85,6 +85,7 @@ static int zflag = 0;
static int run_v4 = 0;
static int printtitle = 1;
static struct ext_nfsstats ext_nfsstats;
static int nfssvc_flag;
void intpr(int, int);
void printhdr(int, int);
@ -107,6 +108,7 @@ main(int argc, char **argv)
char *memf, *nlistf;
char errbuf[_POSIX2_LINE_MAX];
nfssvc_flag = NFSSVC_GETSTATS;
interval = 0;
memf = nlistf = NULL;
while ((ch = getopt(argc, argv, "cesWM:N:w:z")) != -1)
@ -135,6 +137,7 @@ main(int argc, char **argv)
break;
case 'z':
zflag = 1;
nfssvc_flag |= NFSSVC_ZEROSTATS;
break;
case 'e':
run_v4 = 1;
@ -161,7 +164,7 @@ main(int argc, char **argv)
errx(1, "experimental client/server not loaded");
if (run_v4 != 0) {
if (nfssvc(NFSSVC_GETSTATS, &ext_nfsstats) < 0)
if (nfssvc(nfssvc_flag, &ext_nfsstats) < 0)
err(1, "Can't get stats");
} else if (nlistf != NULL || memf != NULL) {
deadkernel = 1;
@ -793,13 +796,13 @@ exp_sidewaysintpr(u_int interval, int clientOnly, int serverOnly)
int hdrcnt = 1;
ext_nfsstatsp = &lastst;
if (nfssvc(NFSSVC_GETSTATS, ext_nfsstatsp) < 0)
if (nfssvc(nfssvc_flag, ext_nfsstatsp) < 0)
err(1, "Can't get stats");
sleep(interval);
for (;;) {
ext_nfsstatsp = &nfsstats;
if (nfssvc(NFSSVC_GETSTATS, ext_nfsstatsp) < 0)
if (nfssvc(nfssvc_flag, ext_nfsstatsp) < 0)
err(1, "Can't get stats");
if (--hdrcnt == 0) {