make nfsstats counters 64 bit.

ok pedro@

2 files changed, 49 insertions, 49 deletions

diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index e632fe0171d..03292652ac1 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs.h,v 1.23 2005/04/02 01:00:38 mickey Exp $	*/
+/*	$OpenBSD: nfs.h,v 1.24 2005/06/08 04:17:14 marius Exp $	*/
 /*	$NetBSD: nfs.h,v 1.10.4.1 1996/05/27 11:23:56 fvdl Exp $	*/
 
 /*
@@ -170,39 +170,39 @@ struct nfsd_cargs {
  * Stats structure
  */
 struct nfsstats {
-	int	attrcache_hits;
-	int	attrcache_misses;
-	int	lookupcache_hits;
-	int	lookupcache_misses;
-	int	direofcache_hits;
-	int	direofcache_misses;
-	int	biocache_reads;
-	int	read_bios;
-	int	read_physios;
-	int	biocache_writes;
-	int	write_bios;
-	int	write_physios;
-	int	biocache_readlinks;
-	int	readlink_bios;
-	int	biocache_readdirs;
-	int	readdir_bios;
-	int	rpccnt[NFS_NPROCS];
-	int	rpcretries;
-	int	srvrpccnt[NFS_NPROCS];
-	int	srvrpc_errs;
-	int	srv_errs;
-	int	rpcrequests;
-	int	rpctimeouts;
-	int	rpcunexpected;
-	int	rpcinvalid;
-	int	srvcache_inproghits;
-	int	srvcache_idemdonehits;
-	int	srvcache_nonidemdonehits;
-	int	srvcache_misses;
-	int	srvnqnfs_leases;
-	int	srvnqnfs_maxleases;
-	int	srvnqnfs_getleases;
-	int	srvvop_writes;
+	uint64_t	attrcache_hits;
+	uint64_t	attrcache_misses;
+	uint64_t	lookupcache_hits;
+	uint64_t	lookupcache_misses;
+	uint64_t	direofcache_hits;
+	uint64_t	direofcache_misses;
+	uint64_t	biocache_reads;
+	uint64_t	read_bios;
+	uint64_t	read_physios;
+	uint64_t	biocache_writes;
+	uint64_t	write_bios;
+	uint64_t	write_physios;
+	uint64_t	biocache_readlinks;
+	uint64_t	readlink_bios;
+	uint64_t	biocache_readdirs;
+	uint64_t	readdir_bios;
+	uint64_t	rpccnt[NFS_NPROCS];
+	uint64_t	rpcretries;
+	uint64_t	srvrpccnt[NFS_NPROCS];
+	uint64_t	srvrpc_errs;
+	uint64_t	srv_errs;
+	uint64_t	rpcrequests;
+	uint64_t	rpctimeouts;
+	uint64_t	rpcunexpected;
+	uint64_t	rpcinvalid;
+	uint64_t	srvcache_inproghits;
+	uint64_t	srvcache_idemdonehits;
+	uint64_t	srvcache_nonidemdonehits;
+	uint64_t	srvcache_misses;
+	uint64_t	srvnqnfs_leases;
+	uint64_t	srvnqnfs_maxleases;
+	uint64_t	srvnqnfs_getleases;
+	uint64_t	srvvop_writes;
 };
 
 /*
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 75154bac3bf..35ac785d8ec 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfsstat.c,v 1.25 2004/12/14 12:21:04 pedro Exp $	*/
+/*	$OpenBSD: nfsstat.c,v 1.26 2005/06/08 04:17:14 marius Exp $	*/
 /*	$NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $	*/
 
 /*
@@ -44,7 +44,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.25 2004/12/14 12:21:04 pedro Exp $";
+static char *rcsid = "$OpenBSD: nfsstat.c,v 1.26 2005/06/08 04:17:14 marius Exp $";
 #endif
 #endif /* not lint */
 
@@ -218,7 +218,7 @@ intpr(u_int display)
 		printf("%9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s\n",
 		    "Getattr", "Setattr", "Lookup", "Readlink", "Read",
 		    "Write", "Create", "Remove");
-		printf("%9d %9d %9d %9d %9d %9d %9d %9d\n",
+		printf("%9lld %9lld %9lld %9lld %9lld %9lld %9lld %9lld\n",
 		    nfsstats.rpccnt[NFSPROC_GETATTR],
 		    nfsstats.rpccnt[NFSPROC_SETATTR],
 		    nfsstats.rpccnt[NFSPROC_LOOKUP],
@@ -230,7 +230,7 @@ intpr(u_int display)
 		printf("%9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s\n",
 		    "Rename", "Link", "Symlink", "Mkdir", "Rmdir",
 		    "Readdir", "RdirPlus", "Access");
-		printf("%9d %9d %9d %9d %9d %9d %9d %9d\n",
+		printf("%9lld %9lld %9lld %9lld %9lld %9lld %9lld %9lld\n",
 		    nfsstats.rpccnt[NFSPROC_RENAME],
 		    nfsstats.rpccnt[NFSPROC_LINK],
 		    nfsstats.rpccnt[NFSPROC_SYMLINK],
@@ -241,7 +241,7 @@ intpr(u_int display)
 		    nfsstats.rpccnt[NFSPROC_ACCESS]);
 		printf("%9.9s %9.9s %9.9s %9.9s %9.9s\n",
 		    "Mknod", "Fsstat", "Fsinfo", "PathConf", "Commit");
-		printf("%9d %9d %9d %9d %9d\n",
+		printf("%9lld %9lld %9lld %9lld %9lld\n",
 		    nfsstats.rpccnt[NFSPROC_MKNOD],
 		    nfsstats.rpccnt[NFSPROC_FSSTAT],
 		    nfsstats.rpccnt[NFSPROC_FSINFO],
@@ -250,7 +250,7 @@ intpr(u_int display)
 		printf("Rpc Info:\n");
 		printf("%9.9s %9.9s %9.9s %9.9s %9.9s\n",
 		    "TimedOut", "Invalid", "X Replies", "Retries", "Requests");
-		printf("%9d %9d %9d %9d %9d\n",
+		printf("%9lld %9lld %9lld %9lld %9lld\n",
 		    nfsstats.rpctimeouts,
 		    nfsstats.rpcinvalid,
 		    nfsstats.rpcunexpected,
@@ -261,10 +261,10 @@ intpr(u_int display)
 		    "Attr Hits", "Misses", "Lkup Hits", "Misses");
 		printf(" %9.9s %9.9s %9.9s %9.9s\n",
 		    "BioR Hits", "Misses", "BioW Hits", "Misses");
-		printf("%9d %9d %9d %9d",
+		printf("%9lld %9lld %9lld %9lld",
 		    nfsstats.attrcache_hits, nfsstats.attrcache_misses,
 		    nfsstats.lookupcache_hits, nfsstats.lookupcache_misses);
-		printf(" %9d %9d %9d %9d\n",
+		printf(" %9lld %9lld %9lld %9lld\n",
 		    nfsstats.biocache_reads-nfsstats.read_bios,
 		    nfsstats.read_bios,
 		    nfsstats.biocache_writes-nfsstats.write_bios,
@@ -272,12 +272,12 @@ intpr(u_int display)
 		printf("%9.9s %9.9s %9.9s %9.9s",
 		    "BioRLHits", "Misses", "BioD Hits", "Misses");
 		printf(" %9.9s %9.9s\n", "DirE Hits", "Misses");
-		printf("%9d %9d %9d %9d",
+		printf("%9lld %9lld %9lld %9lld",
 		    nfsstats.biocache_readlinks-nfsstats.readlink_bios,
 		    nfsstats.readlink_bios,
 		    nfsstats.biocache_readdirs-nfsstats.readdir_bios,
 		    nfsstats.readdir_bios);
-		printf(" %9d %9d\n",
+		printf(" %9lld %9lld\n",
 		    nfsstats.direofcache_hits, nfsstats.direofcache_misses);
 	}
 
@@ -289,7 +289,7 @@ intpr(u_int display)
 		printf("%9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s\n",
 		    "Getattr", "Setattr", "Lookup", "Readlink", "Read",
 		    "Write", "Create", "Remove");
-		printf("%9d %9d %9d %9d %9d %9d %9d %9d\n",
+		printf("%9lld %9lld %9lld %9lld %9lld %9lld %9lld %9lld\n",
 		    nfsstats.srvrpccnt[NFSPROC_GETATTR],
 		    nfsstats.srvrpccnt[NFSPROC_SETATTR],
 		    nfsstats.srvrpccnt[NFSPROC_LOOKUP],
@@ -301,7 +301,7 @@ intpr(u_int display)
 		printf("%9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s\n",
 		    "Rename", "Link", "Symlink", "Mkdir", "Rmdir",
 		    "Readdir", "RdirPlus", "Access");
-		printf("%9d %9d %9d %9d %9d %9d %9d %9d\n",
+		printf("%9lld %9lld %9lld %9lld %9lld %9lld %9lld %9lld\n",
 		    nfsstats.srvrpccnt[NFSPROC_RENAME],
 		    nfsstats.srvrpccnt[NFSPROC_LINK],
 		    nfsstats.srvrpccnt[NFSPROC_SYMLINK],
@@ -312,7 +312,7 @@ intpr(u_int display)
 		    nfsstats.srvrpccnt[NFSPROC_ACCESS]);
 		printf("%9.9s %9.9s %9.9s %9.9s %9.9s\n",
 		    "Mknod", "Fsstat", "Fsinfo", "PathConf", "Commit");
-		printf("%9d %9d %9d %9d %9d\n",
+		printf("%9lld %9lld %9lld %9lld %9lld\n",
 		    nfsstats.srvrpccnt[NFSPROC_MKNOD],
 		    nfsstats.srvrpccnt[NFSPROC_FSSTAT],
 		    nfsstats.srvrpccnt[NFSPROC_FSINFO],
@@ -325,7 +325,7 @@ intpr(u_int display)
 		printf("Server Cache Stats:\n");
 		printf("%9.9s %9.9s %9.9s %9.9s\n",
 		    "Inprog", "Idem", "Non-idem", "Misses");
-		printf("%9d %9d %9d %9d\n",
+		printf("%9lld %9lld %9lld %9lld\n",
 		    nfsstats.srvcache_inproghits,
 		    nfsstats.srvcache_idemdonehits,
 		    nfsstats.srvcache_nonidemdonehits,
@@ -333,7 +333,7 @@ intpr(u_int display)
 		printf("Server Write Gathering:\n");
 		printf("%9.9s %9.9s %9.9s\n",
 		    "WriteOps", "WriteRPC", "Opsaved");
-		printf("%9d %9d %9d\n",
+		printf("%9lld %9lld %9lld\n",
 		    nfsstats.srvvop_writes,
 		    nfsstats.srvrpccnt[NFSPROC_WRITE],
 		    nfsstats.srvrpccnt[NFSPROC_WRITE] - nfsstats.srvvop_writes);