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

Add a -z flag to nfsstat which zeros the NFS statistics after displaying

Browse Source 
them.

MFC after:	1 week
Requested by:	ps
Submitted by:	ps (6 years ago)
This commit is contained in:
jhb 2007-10-18 16:38:07 +00:00
parent d2c2b5f35c
commit 1f6b3a5f2c
4 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/nfsclient/nfs_vfsops.c
View File

@ -88,7 +88,7 @@ uma_zone_t nfsmount_zone;
struct nfsstats nfsstats;
SYSCTL_NODE(_vfs, OID_AUTO, nfs, CTLFLAG_RW, 0, "NFS filesystem");
SYSCTL_STRUCT(_vfs_nfs, NFS_NFSSTATS, nfsstats, CTLFLAG_RD,
SYSCTL_STRUCT(_vfs_nfs, NFS_NFSSTATS, nfsstats, CTLFLAG_RW,
&nfsstats, nfsstats, "S,nfsstats");
static int nfs_ip_paranoia = 1;
SYSCTL_INT(_vfs_nfs, OID_AUTO, nfs_ip_paranoia, CTLFLAG_RW,

2
sys/nfsserver/nfs_serv.c
View File

@ -135,7 +135,7 @@ SYSCTL_INT(_vfs_nfsrv, OID_AUTO, commit_blks, CTLFLAG_RW, &nfs_commit_blks, 0, "
SYSCTL_INT(_vfs_nfsrv, OID_AUTO, commit_miss, CTLFLAG_RW, &nfs_commit_miss, 0, "");
struct nfsrvstats nfsrvstats;
SYSCTL_STRUCT(_vfs_nfsrv, NFS_NFSRVSTATS, nfsrvstats, CTLFLAG_RD,
SYSCTL_STRUCT(_vfs_nfsrv, NFS_NFSRVSTATS, nfsrvstats, CTLFLAG_RW,
&nfsrvstats, nfsrvstats, "S,nfsrvstats");
static int nfsrv_access(struct vnode *, int, struct ucred *, int,

6
usr.bin/nfsstat/nfsstat.1
View File

@ -32,7 +32,7 @@
.\" From: @(#)nfsstat.1 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
.Dd June 6, 1993
.Dd October 18, 2007
.Dt NFSSTAT 1
.Os
.Sh NAME
@ -42,7 +42,7 @@
statistics
.Sh SYNOPSIS
.Nm
.Op Fl csW
.Op Fl cszW
.Op Fl M Ar core
.Op Fl N Ar system
.Op Fl w Ar wait
@ -80,6 +80,8 @@ Display a shorter summary of
activity for both the client and server at
.Ar wait
second intervals.
.It Fl z
Reset statistics after displaying them.
.El
.Sh FILES
.Bl -tag -width ".Pa /boot/kernel/kernel" -compact

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

@ -81,6 +81,7 @@ kvm_t *kd;
static int deadkernel = 0;
static int widemode = 0;
static int zflag = 0;
void intpr(int, int);
void printhdr(int, int);
@ -92,9 +93,7 @@ char *sperc2(int, int);
#define DELTA(field) (nfsstats.field - lastst.field)
int
main(argc, argv)
int argc;
char **argv;
main(int argc, char **argv)
{
u_int interval;
int clientOnly = -1;
@ -105,7 +104,7 @@ main(argc, argv)
interval = 0;
memf = nlistf = NULL;
while ((ch = getopt(argc, argv, "csWM:N:w:")) != -1)
while ((ch = getopt(argc, argv, "csWM:N:w:z")) != -1)
switch(ch) {
case 'M':
memf = optarg;
@ -129,6 +128,9 @@ main(argc, argv)
if (clientOnly < 0)
clientOnly = 0;
break;
case 'z':
zflag = 1;
break;
case '?':
default:
usage();
@ -171,30 +173,40 @@ main(argc, argv)
* for dead ones.
*/
void
readstats(stp, srvstp)
struct nfsstats **stp;
struct nfsrvstats **srvstp;
readstats(struct nfsstats **stp, struct nfsrvstats **srvstp, int zero)
{
union {
struct nfsstats client;
struct nfsrvstats server;
} zerostat;
size_t buflen;
if (deadkernel) {
if (kvm_read(kd, (u_long)nl[N_NFSSTAT].n_value, *stp,
sizeof(struct nfsstats)) < 0) {
if (*stp != NULL && kvm_read(kd, (u_long)nl[N_NFSSTAT].n_value,
*stp, sizeof(struct nfsstats)) < 0) {
*stp = NULL;
}
if (kvm_read(kd, (u_long)nl[N_NFSRVSTAT].n_value, *srvstp,
sizeof(struct nfsrvstats)) < 0) {
if (*srvstp != NULL && kvm_read(kd,
(u_long)nl[N_NFSRVSTAT].n_value, *srvstp,
sizeof(struct nfsrvstats)) < 0) {
*srvstp = NULL;
}
} else {
if (zero)
bzero(&zerostat, sizeof(zerostat));
buflen = sizeof(struct nfsstats);
if (sysctlbyname("vfs.nfs.nfsstats", *stp, &buflen,
(void *)0, (size_t)0) < 0) {
if (*stp != NULL && sysctlbyname("vfs.nfs.nfsstats", *stp,
&buflen, zero ? &zerostat : NULL, zero ? buflen : 0) < 0) {
if (errno != ENOENT)
err(1, "sysctl: vfs.nfs.nfsstats");
*stp = NULL;
}
buflen = sizeof(struct nfsrvstats);
if (sysctlbyname("vfs.nfsrv.nfsrvstats", *srvstp, &buflen,
(void *)0, (size_t)0) < 0) {
if (*srvstp != NULL && sysctlbyname("vfs.nfsrv.nfsrvstats",
*srvstp, &buflen, zero ? &zerostat : NULL,
zero ? buflen : 0) < 0) {
if (errno != ENOENT)
err(1, "sysctl: vfs.nfsrv.nfsrvstats");
*srvstp = NULL;
}
}
@ -209,10 +221,20 @@ intpr(int clientOnly, int serverOnly)
struct nfsstats nfsstats, *nfsstatsp;
struct nfsrvstats nfsrvstats, *nfsrvstatsp;
nfsstatsp = &nfsstats;
nfsrvstatsp = &nfsrvstats;
/*
* Only read the stats we are going to display to avoid zeroing
* stats the user didn't request.
*/
if (clientOnly)
nfsstatsp = &nfsstats;
else
nfsstatsp = NULL;
if (serverOnly)
nfsrvstatsp = &nfsrvstats;
else
nfsrvstatsp = NULL;
readstats(&nfsstatsp, &nfsrvstatsp);
readstats(&nfsstatsp, &nfsrvstatsp, zflag);
if (clientOnly && !nfsstatsp) {
printf("Client not present!\n");
@ -365,7 +387,7 @@ sidewaysintpr(u_int interval, int clientOnly, int serverOnly)
nfsstatsp = &lastst;
nfsrvstatsp = &lastsrvst;
readstats(&nfsstatsp, &nfsrvstatsp);
readstats(&nfsstatsp, &nfsrvstatsp, 0);
if (clientOnly && !nfsstatsp) {
printf("Client not present!\n");
clientOnly = 0;
@ -379,7 +401,7 @@ sidewaysintpr(u_int interval, int clientOnly, int serverOnly)
for (;;) {
nfsstatsp = &nfsstats;
nfsrvstatsp = &nfsrvstats;
readstats(&nfsstatsp, &nfsrvstatsp);
readstats(&nfsstatsp, &nfsrvstatsp, 0);
if (--hdrcnt == 0) {
printhdr(clientOnly, serverOnly);
@ -455,10 +477,10 @@ printhdr(int clientOnly, int serverOnly)
}
void
usage()
usage(void)
{
(void)fprintf(stderr,
"usage: nfsstat [-csW] [-M core] [-N system] [-w interval]\n");
"usage: nfsstat [-cszW] [-M core] [-N system] [-w interval]\n");
exit(1);
}