Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix to use new KVM routines. bug 265. from arndt@mailhost.uni-koblenz.de.

Browse Source
This commit is contained in:
cgd 1994-05-27 11:19:02 +00:00
parent bde4697a5e
commit 9dd345a6c9
2 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/nfsstat/Makefile
View File

@ -1,9 +1,11 @@
# from: @(#)Makefile 5.2 (Berkeley) 5/11/90 # from: @(#)Makefile 5.2 (Berkeley) 5/11/90
# $Id: Makefile,v 1.2 1993/08/01 05:38:08 mycroft Exp $ # $Id: Makefile,v 1.3 1994/05/27 11:19:02 cgd Exp $
PROG= nfsstat PROG= nfsstat
CFLAGS+=-DNFS CFLAGS+=-DNFS
BINGRP= kmem BINGRP= kmem
BINMODE=2555 BINMODE=2555
LDADD=-lkvm
.include <bsd.prog.mk> .include <bsd.prog.mk>

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

@ -42,7 +42,7 @@ char copyright[] =
#ifndef lint #ifndef lint
/*static char sccsid[] = "from: @(#)nfsstat.c 5.9 (Berkeley) 7/1/91";*/ /*static char sccsid[] = "from: @(#)nfsstat.c 5.9 (Berkeley) 7/1/91";*/
static char rcsid[] = "$Id: nfsstat.c,v 1.2 1993/08/01 18:10:36 mycroft Exp $"; static char rcsid[] = "$Id: nfsstat.c,v 1.3 1994/05/27 11:19:08 cgd Exp $";
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -66,6 +66,7 @@ static char rcsid[] = "$Id: nfsstat.c,v 1.2 1993/08/01 18:10:36 mycroft Exp $";
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <paths.h> #include <paths.h>
#include <kvm.h>
struct nlist nl[] = { struct nlist nl[] = {
#define N_NFSSTAT 0 #define N_NFSSTAT 0
@ -83,11 +84,11 @@ struct nlist nl[] = {
struct pte *Sysmap; struct pte *Sysmap;
#endif #endif
int kflag, kmem; int kflag;
kvm_t *kmem;
char *kernel = _PATH_UNIX; char *kernel = _PATH_UNIX;
char *kmemf = _PATH_KMEM; char *kmemf = _PATH_KMEM;
off_t klseek();
void intpr(), printhdr(), sidewaysintpr(), usage(); void intpr(), printhdr(), sidewaysintpr(), usage();
main(argc, argv) main(argc, argv)
@ -133,10 +134,11 @@ main(argc, argv)
(void)fprintf(stderr, "nfsstate: %s: no namelist\n", kernel); (void)fprintf(stderr, "nfsstate: %s: no namelist\n", kernel);
exit(1); exit(1);
} }
kmem = open(kmemf, O_RDONLY); kmem = kvm_open(NULL,NULL,NULL,O_RDONLY,"kvm_open");
if (kmem < 0) { if (kmem == NULL) {
(void)fprintf(stderr, (void)fprintf(stderr,
"nfsstat: %s: %s\n", kmemf, strerror(errno)); "nfsstat: %s: %s\n", kmemf, strerror(errno));
kvm_close(kmem);
exit(1); exit(1);
} }
if (kflag) { if (kflag) {
@ -152,21 +154,21 @@ main(argc, argv)
(void)fprintf(stderr, "nfsstat: %s\n", strerror(errno)); (void)fprintf(stderr, "nfsstat: %s\n", strerror(errno));
exit(1); exit(1);
} }
off = nl[N_SYSMAP].n_value & ~KERNBASE; kvm_read(kmem, (long) nl[N_SYSMAP].n_value, (char *)Sysmap,
(void)lseek(kmem, off, L_SET); (int)(nl[N_SYSSIZE].n_value * sizeof(struct pte)));
(void)read(kmem, (char *)Sysmap,
(int)(nl[N_SYSSIZE].n_value * sizeof(struct pte)));
#endif #endif
} }
if (!nl[N_NFSSTAT].n_value) { if (!nl[N_NFSSTAT].n_value) {
(void)fprintf(stderr, "nfsstat: nfsstats symbol not defined\n"); (void)fprintf(stderr, "nfsstat: nfsstats symbol not defined\n");
kvm_close(kmem);
exit(1); exit(1);
} }
if (interval) if (interval)
sidewaysintpr(interval, nl[N_NFSSTAT].n_value); sidewaysintpr(interval, nl[N_NFSSTAT].n_value);
else else
intpr(nl[N_NFSSTAT].n_value); intpr(nl[N_NFSSTAT].n_value);
kvm_close(kmem);
exit(0); exit(0);
} }
@ -179,8 +181,7 @@ intpr(nfsstataddr)
{ {
struct nfsstats nfsstats; struct nfsstats nfsstats;
klseek(kmem, nfsstataddr, 0L); kvm_read(kmem, nfsstataddr, (char *)&nfsstats, sizeof(struct nfsstats));
read(kmem, (char *)&nfsstats, sizeof(struct nfsstats));
printf("Client Info:\n"); printf("Client Info:\n");
printf("Rpc Counts:\n"); printf("Rpc Counts:\n");
printf("%9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s\n", printf("%9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s\n",
@ -293,8 +294,6 @@ sidewaysintpr(interval, off)
int hdrcnt, oldmask; int hdrcnt, oldmask;
void catchalarm(); void catchalarm();
klseek(kmem, off, 0L);
(void)signal(SIGALRM, catchalarm); (void)signal(SIGALRM, catchalarm);
signalled = 0; signalled = 0;
(void)alarm(interval); (void)alarm(interval);
@ -305,8 +304,8 @@ sidewaysintpr(interval, off)
printhdr(); printhdr();
hdrcnt = 20; hdrcnt = 20;
} }
klseek(kmem, off, 0L); kvm_read(kmem, off, (char *)&nfsstats,
read(kmem, (char *)&nfsstats, sizeof nfsstats); sizeof(struct nfsstats));
printf("Client: %8d %8d %8d %8d %8d %8d %8d %8d\n", printf("Client: %8d %8d %8d %8d %8d %8d %8d %8d\n",
nfsstats.rpccnt[1]-lastst.rpccnt[1], nfsstats.rpccnt[1]-lastst.rpccnt[1],
nfsstats.rpccnt[4]-lastst.rpccnt[4], nfsstats.rpccnt[4]-lastst.rpccnt[4],
@ -356,24 +355,6 @@ catchalarm()
signalled = 1; signalled = 1;
} }
/*
* Seek into the kernel for a value.
*/
off_t
klseek(fd, base, off)
int fd, off;
off_t base;
{
#ifndef NEWVM
if (kflag) {
/* get kernel pte */
base &= ~KERNBASE;
base = ctob(Sysmap[btop(base)].pg_pfnum) + (base & PGOFSET);
}
#endif
return (lseek(fd, base, off));
}
void void
usage() usage()
{ {