Commit Graph

45 Commits

Author SHA1 Message Date
John Baldwin
1809b04b69 Use the DELTA() macro to tidy the server-side interval stats code a bit.
MFC after:	2 weeks
2014-02-05 14:44:59 +00:00
John Baldwin
2fdfccfd7c 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
2014-02-05 14:33:22 +00:00
Rick Macklem
7c44c1146b Modify nfsstat.c so that it prints out an error when a non-root
user attempts to use the "-m" option and it fails.

Requested by:	danny@cs.huji.ac.il
MFC after:	2 weeks
2013-06-09 21:54:19 +00:00
Rick Macklem
a6c903b8d4 Add a "-m" option to nfsstat, which dumps out the
actual options used by all NFS mounts. Works for
the new/default NFS client only.

Reviewed by:	alfred
MFC after:	2 weeks
2012-12-02 01:20:43 +00:00
Hiroki Sato
70a8f993c0 Fix a bug which prevents "nfsstat -W" for server statistics from working. 2012-07-22 18:59:31 +00:00
Rick Macklem
002c2778b1 Fix nfsstat(1) so that it prints out correct stats for the
new NFS server when the "-e" option is not used. The bug was
that srvrpccnt[] was being indexed by NFSPROC_XXX when it needs
to be indexed by NFSV4OP_XXX.

Tested by:	hrs
Approved by:	re (bz)
2011-08-23 13:44:56 +00:00
Rick Macklem
806f9b4262 Fix nfsstat(1) so that it prints out correct stats for the
new NFS server when the "-w" option is used. The problem was
spotted by hrs@ during testing where srvrpcnt[] must be indexed
by NFSV4OP_XXX and not NFSPROC_XXX.

Submitted by:	hrs
Approved by:	re (bz)
MFC after:	2 weeks
2011-08-23 13:17:09 +00:00
Rick Macklem
1f3765902c Change the sysctl naming for the old and new NFS clients
to vfs.oldnfs.xxx and vfs.nfs.xxx respectively. This makes
the default nfs client use vfs.nfs.xxx after r221124.
2011-05-15 20:52:43 +00:00
Ruslan Ermilov
6d0d87ca78 - Add a forgotten -o to usage().
- Sync usage() with manpage's SYNOPSIS.
2011-05-05 10:17:49 +00:00
Rick Macklem
e85b7d75a4 Modify nfsstat(1) so that it reports statistics for the
new NFS client/server by default, in a format compatible
with the old NFS client/server. Also add a "-o" flag that
forces nfsstat(1) to get statistics for the old NFS
client/server.
2011-05-04 20:13:26 +00:00
Rick Macklem
c01be3b713 Modify nfsstat(1) so that it prints out the buffer cache
stats in the same way for the new client as the old one.

MFC after:	2 weeks
2011-05-04 19:28:44 +00:00
Rick Macklem
0e8f7d1995 Fix nfsstat.c so that the "-z" option works for the new
NFS subsystem.

MFC after:	2 weeks
2011-05-04 13:50:37 +00:00
Rick Macklem
785b257239 Revert r221308, since it incorrectly zero'd both client and
server stats when "-c" or "-s" was specified.
2011-05-04 13:20:44 +00:00
Rick Macklem
d380a59d3d Fix nfsstat so that the "-z" option works for the
new NFS subsystem.

MFC after:	2 weeks
2011-05-01 23:41:35 +00:00
Ruslan Ermilov
4898f742c7 Show client's access cache statistics. 2011-04-13 13:05:48 +00:00
Joel Dahl
da52b4caaf Remove the advertising clause from UCB copyrighted files in usr.bin. This
is in accordance with the information provided at
ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change

Also add $FreeBSD$ to a few files to keep svn happy.

Discussed with:	imp, rwatson
2010-12-11 08:32:16 +00:00
Xin LI
821df508e8 Revert most part of 200420 as requested, as more review and polish is
needed.
2009-12-13 03:14:06 +00:00
Xin LI
6f2d322192 Remove unneeded header includes from usr.bin/ except contributed code.
Tested with:	make universe
2009-12-11 23:35:38 +00:00
Doug Rabson
0775314b63 Don't use sys/nfs/rpcv2.h - it is part of the old kernel RPC implementation
and will be removed.
2009-06-24 18:42:21 +00:00
Xin LI
db995e0027 Use C99 initialization when necessary; apply static to internal rountines.
This makes nfsstat WARNS=3 clean.
2009-06-23 23:18:19 +00:00
Ed Schouten
33f5882ec0 Include <sys/module.h> for modfind().
Submitted by:	Pawel Worach
2009-06-14 12:47:27 +00:00
Rick Macklem
61a2fc1fbb Change the "-4" option flag to "-e" since it does not refer to IPv4
and to make it consistent with the flag used by nfsd and mountd.

Approved by:	kib (mentor)
2009-06-01 20:34:00 +00:00
Rick Macklem
bcdaa85069 Add the "-4" option to nfsstat, so that it will reports stats
for the experimental nfs subsystem when that option is specified.

Approved by:	kib (mentor)
2009-05-25 15:48:10 +00:00
John Baldwin
813947b737 Add a -z flag to nfsstat which zeros the NFS statistics after displaying
them.

MFC after:	1 week
Requested by:	ps
Submitted by:	ps (6 years ago)
2007-10-18 16:38:07 +00:00
Stefan Farfeleder
70c3c978b9 Fix a few cases that relied on 'implicit int' (constraint violation in C99). 2004-07-11 17:37:33 +00:00
Warner Losh
d3cb5ded92 remove __P 2002-03-22 01:33:25 +00:00
Peter Wemm
9119623471 Userland part of nfs client/server split and cleanup. 2001-09-18 23:34:44 +00:00
Thomas Moestl
9c9f2eefc8 Fix the error buffer passed to kvm_openfiles to have a correct length
of _POSIX2_LINE_MAX.

MFC after:	3 days
2001-05-25 23:36:09 +00:00
Thomas Moestl
f8d15d5230 Take setgid kmem away from nfsstat, it has not needed it for some time
now.

Approved by:	rwatson
2001-03-22 17:39:57 +00:00
Warner Losh
62f882d620 getopt and friends are declared in <unistd.h>
getopt returns -1 not EOF.
2000-09-04 06:09:54 +00:00
David E. O'Brien
6e0442dee9 Options added in rev 1.14 were not documented in usage(). 1999-12-16 09:49:24 +00:00
Matthew Dillon
4893ef0bc8 Add -c, -s, and -W options to nfsstat. Improve interval output and add
wide-format option to get client-side ops and cache statistics on a single
    line.

    Change client side ops to the number of attempted ops, whether cached or
    not, rather then just the number of rpc's that went through to the server.
    This brings nfsstat inline with systat -vm and vmstat and reduces
    confusion.  The combined cache percentage stats now available via
    'nfsstat -cW 1' becomes very useful.
1999-10-25 19:39:17 +00:00
Peter Wemm
c3aac50f28 $Id$ -> $FreeBSD$ 1999-08-28 01:08:13 +00:00
Bruce Evans
83d8891ddc Backout out previous commit. The bug was in the kernel. 1998-10-25 10:59:44 +00:00
Mike Smith
d6324f511d Use sysctlbyname() to locate the vfs.nfs.nfsstats node.
Submitted by:	Daniel Rock <rock@cs.uni-sb.de>
1998-10-24 19:36:52 +00:00
Bruce Evans
eae79dd1c0 Merged from Lite2. This was mostly already done, mostly indirectly
via wollman's changes in rev.1.2 being adopted by Lite2 and the
nfsv3 changes in rev.1.3 being adopted by both FreeBSD and Lite2.
We were only missing lookup of the type number for nfs (MOUNT_NFS
doesn't exist in Lite2).
1998-01-20 12:27:38 +00:00
Warner Losh
1c8af87873 compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.
1997-03-29 04:34:07 +00:00
Peter Wemm
c115df18cd Revert $FreeBSD$ to $Id$ 1997-02-22 19:58:13 +00:00
Jordan K. Hubbard
1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
Jeffrey Hsu
782ff9b2f0 From Lite2: rename fs to vfs. 1996-03-11 03:06:45 +00:00
Poul-Henning Kamp
5a4838fc5e <sys/user.h> -> <sys/time.h>
Spotted by:	bde
1995-10-30 15:44:44 +00:00
Poul-Henning Kamp
52a28d7027 #include <sys/user.h> 1995-10-29 09:56:53 +00:00
Doug Rabson
a62dc40654 Changes to support version 3 of the NFS protocol.
The version 2 support has been tested (client+server) against FreeBSD-2.0,
IRIX 5.3 and FreeBSD-current (using a loopback mount).  The version 2 support
is stable AFAIK.
The version 3 support has been tested with a loopback mount and minimally
against an IRIX 5.3 server.  It needs more testing and may have problems.
I have patched amd to support the new variable length filehandles although
it will still only use version 2 of the protocol.

Before booting a kernel with these changes, nfs clients will need to at least
build and install /usr/sbin/mount_nfs.  Servers will need to build and
install /usr/sbin/mountd.

NFS diskless support is untested.

Obtained from: Rick Macklem <rick@snowhite.cis.uoguelph.ca>
1995-06-27 11:07:30 +00:00
Garrett Wollman
07e532e7d6 Use new NFS sysctl interface to get statistics rather than reading /dev/kmem,
unless the user specifies a dead kernel to operate on.
1994-10-23 23:25:43 +00:00
Rodney W. Grimes
9b50d90275 BSD 4.4 Lite Usr.bin Sources 1994-05-27 12:33:43 +00:00