From: mickey Date: Tue, 18 Apr 2000 15:24:26 +0000 (+0000) Subject: use sysctl() to fetch struct nfsstats; no more -lkvm; millert@ ok X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7b8c89953444271b567fb22f352bf90d20093041;p=openbsd use sysctl() to fetch struct nfsstats; no more -lkvm; millert@ ok --- diff --git a/usr.bin/nfsstat/Makefile b/usr.bin/nfsstat/Makefile index 2c49ca1efcc..e33568b688e 100644 --- a/usr.bin/nfsstat/Makefile +++ b/usr.bin/nfsstat/Makefile @@ -1,10 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:17 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2000/04/18 15:24:26 mickey Exp $ PROG= nfsstat CFLAGS+=-DNFS -DPADD= ${LIBKVM} -LDADD= -lkvm -BINGRP= kmem -BINMODE=2555 .include diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1 index 8069b5bbf53..f7c33f67485 100644 --- a/usr.bin/nfsstat/nfsstat.1 +++ b/usr.bin/nfsstat/nfsstat.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: nfsstat.1,v 1.6 1999/06/05 01:21:35 aaron Exp $ +.\" $OpenBSD: nfsstat.1,v 1.7 2000/04/18 15:24:26 mickey Exp $ .\" $NetBSD: nfsstat.1,v 1.8 1996/03/03 17:21:28 thorpej Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 @@ -44,8 +44,6 @@ statistics .Sh SYNOPSIS .Nm nfsstat -.Op Fl M Ar core -.Op Fl N Ar system .Op Fl w Ar wait .Op Fl s .Op Fl c @@ -57,13 +55,6 @@ client and server activity. .Pp The options are as follows: .Bl -tag -width Ds -.It Fl M Ar core -Extract values associated with the name list from the specified core -instead of the default -.Pa /dev/kmem . -.It Fl N Ar system -Extract the name list from the specified system instead of the default -.Pa /bsd . .It Fl w Ar wait Display a shorter summary of .Tn NFS @@ -75,13 +66,6 @@ Display server statistics only. .It Fl c Display client statistics only. .El -.Sh FILES -.Bl -tag -width /dev/kmem -compact -.It Pa /bsd -default kernel namelist -.It Pa /dev/kmem -default memory file -.El .Sh SEE ALSO .Xr fstat 1 , .Xr netstat 1 , diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index d5cae87e162..fb86b3927c5 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsstat.c,v 1.7 1998/07/05 18:42:43 deraadt Exp $ */ +/* $OpenBSD: nfsstat.c,v 1.8 2000/04/18 15:24:26 mickey Exp $ */ /* $NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $ */ /* @@ -48,7 +48,7 @@ static char copyright[] = static char sccsid[] = "from: @(#)nfsstat.c 8.1 (Berkeley) 6/6/93"; static char *rcsid = "$NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $"; #else -static char *rcsid = "$OpenBSD: nfsstat.c,v 1.7 1998/07/05 18:42:43 deraadt Exp $"; +static char *rcsid = "$OpenBSD: nfsstat.c,v 1.8 2000/04/18 15:24:26 mickey Exp $"; #endif #endif /* not lint */ @@ -59,56 +59,49 @@ static char *rcsid = "$OpenBSD: nfsstat.c,v 1.7 1998/07/05 18:42:43 deraadt Exp #include #include #include -#include -#include #include -#include -#include #include #include #include #include -#include -#include #include #define SHOW_SERVER 0x01 #define SHOW_CLIENT 0x02 #define SHOW_ALL (SHOW_SERVER | SHOW_CLIENT) -struct nlist nl[] = { -#define N_NFSSTAT 0 - { "_nfsstats" }, - "", -}; -kvm_t *kd; +u_char signalled; /* set if alarm goes off "early" */ +int nfs_id; -void intpr(), printhdr(), sidewaysintpr(), usage(); +void getnfsstats __P((struct nfsstats *)); +static __inline void printhdr __P((void)); +static __inline void intpr __P((u_int)); +static __inline void sidewaysintpr __P((u_int, u_int)); +static __inline void usage __P((void)); +int main(argc, argv) int argc; char **argv; { extern int optind; extern char *optarg; + char *p; u_int interval; u_int display = SHOW_ALL; int ch; - char *memf, *nlistf; - char errbuf[_POSIX2_LINE_MAX]; interval = 0; - memf = nlistf = NULL; while ((ch = getopt(argc, argv, "M:N:w:sc")) != -1) switch(ch) { case 'M': - memf = optarg; - break; case 'N': - nlistf = optarg; + /* compat */ break; case 'w': - interval = atoi(optarg); + interval = (u_int)strtol(optarg, &p, 0); + if (*optarg != '\0' && *p == '\0') + errx(1, "invalid interval"); break; case 's': display = SHOW_SERVER; @@ -123,57 +116,76 @@ main(argc, argv) argc -= optind; argv += optind; -#define BACKWARD_COMPATIBILITY -#ifdef BACKWARD_COMPATIBILITY - if (*argv) { - interval = atoi(*argv); - if (*++argv) { - nlistf = *argv; - if (*++argv) - memf = *argv; + { + int mib[3]; + size_t len; + + mib[0] = CTL_VFS; + mib[1] = VFS_GENERIC; + mib[2] = VFS_MAXTYPENUM; + len = sizeof(nfs_id); + if (sysctl(mib, 3, &nfs_id, &len, NULL, 0)) + err(1, "sysctl: VFS_MAXTYPENUM"); + + while (nfs_id--) { + struct vfsconf vfsc; + + mib[0] = CTL_VFS; + mib[1] = VFS_GENERIC; + mib[2] = VFS_CONF; + mib[3] = nfs_id; + + len = sizeof(vfsc); + if (sysctl(mib, 4, &vfsc, &len, NULL, 0)) + continue; + + if (!strcmp(vfsc.vfc_name, MOUNT_NFS)) + break; } - } -#endif - /* - * Discard setgid privileges if not the running kernel so that bad - * guys can't print interesting stuff from kernel memory. - */ - if (nlistf != NULL || memf != NULL) { - setegid(getgid()); - setgid(getgid()); - } - if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf)) == 0) { - fprintf(stderr, "nfsstat: kvm_openfiles: %s\n", errbuf); - exit(1); - } - if (kvm_nlist(kd, nl) != 0) { - fprintf(stderr, "nfsstat: kvm_nlist: can't get names\n"); - exit(1); + if (nfs_id < 0) + errx(1, "cannot find nfs filesystem id"); } +#define BACKWARD_COMPATIBILITY +#ifdef BACKWARD_COMPATIBILITY + if (*argv) + interval = atoi(*argv); +#endif if (interval) - sidewaysintpr(interval, nl[N_NFSSTAT].n_value, display); + sidewaysintpr(interval, display); else - intpr(nl[N_NFSSTAT].n_value, display); - exit(0); + intpr(display); + + return 0; +} + +void +getnfsstats(p) + struct nfsstats *p; +{ + int mib[3]; + size_t len = sizeof(*p); + + mib[0] = CTL_VFS; + mib[1] = nfs_id; /* 2 */ + mib[2] = NFS_NFSSTATS; + + if (sysctl(mib, 3, p, &len, NULL, 0)) + err(1, "sysctl"); } /* * Print a description of the nfs stats. */ -void -intpr(nfsstataddr, display) - u_long nfsstataddr; +static __inline void +intpr(display) u_int display; { struct nfsstats nfsstats; - if (kvm_read(kd, (u_long)nfsstataddr, (char *)&nfsstats, - sizeof(struct nfsstats)) != sizeof(struct nfsstats)) { - fprintf(stderr, "nfsstat: kvm_read failed\n"); - exit(1); - } + getnfsstats(&nfsstats); + if (display & SHOW_CLIENT) { printf("Client Info:\n"); printf("Rpc Counts:\n"); @@ -313,18 +325,15 @@ intpr(nfsstataddr, display) } } -u_char signalled; /* set if alarm goes off "early" */ - /* * Print a running summary of nfs statistics. * Repeat display every interval seconds, showing statistics * collected over that interval. Assumes that interval is non-zero. * First line printed at top of screen is always cumulative. */ -void -sidewaysintpr(interval, off, display) +static __inline void +sidewaysintpr(interval, display) u_int interval; - u_long off; u_int display; { struct nfsstats nfsstats, lastst; @@ -341,11 +350,9 @@ sidewaysintpr(interval, off, display) printhdr(); hdrcnt = 20; } - if (kvm_read(kd, off, (char *)&nfsstats, sizeof nfsstats) != - sizeof nfsstats) { - fprintf(stderr, "nfsstat: kvm_read failed\n"); - exit(1); - } + + getnfsstats(&nfsstats); + if (display & SHOW_CLIENT) printf("Client: %8d %8d %8d %8d %8d %8d %8d %8d\n", nfsstats.rpccnt[NFSPROC_GETATTR]-lastst.rpccnt[NFSPROC_GETATTR], @@ -380,7 +387,7 @@ sidewaysintpr(interval, off, display) /*NOTREACHED*/ } -void +static __inline void printhdr() { printf(" %8.8s %8.8s %8.8s %8.8s %8.8s %8.8s %8.8s %8.8s\n", @@ -399,10 +406,10 @@ catchalarm() signalled = 1; } -void +static __inline void usage() { - (void)fprintf(stderr, - "usage: nfsstat [-M core] [-N system] [-w interval]\n"); + extern char *__progname; + fprintf(stderr, "usage: %s [-s] [-c] [-w interval]\n", __progname); exit(1); }