bumb the bcachestats and the nchstats counters from long

to u_int64_t's; add two new counters to nchstats that will
be used in the future.

ok art@, beck@

2 files changed, 40 insertions, 34 deletions

diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index a9a157525e1..e3811be2862 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount.h,v 1.89 2008/07/02 15:21:33 art Exp $	*/
+/*	$OpenBSD: mount.h,v 1.90 2008/07/05 12:56:52 thib Exp $	*/
 /*	$NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $	*/
 
 /*
@@ -490,17 +490,17 @@ struct vfsconf {
 
 /* buffer cache statistics */
 struct bcachestats {
-	long numbufs; 		/* number of buffers allocated */
-	long freebufs;		/* number of free buffers */
-	long numbufpages; 	/* number of pages in buffer cache */
-	long numfreepages; 	/* number of free pages */
-	long numdirtypages; 	/* number of dirty free pages */
-	long numcleanpages; 	/* number of clean free pages */
-	long pendingwrites;	/* number of pending writes */
-	long pendingreads;	/* number of pending reads */
-	long numwrites;		/* total writes started */
-	long numreads;		/* total reads started */
-	long cachehits;		/* total reads found in cache */
+	u_int64_t numbufs;		/* number of buffers allocated */
+	u_int64_t freebufs;		/* number of free buffers */
+	u_int64_t numbufpages;		/* number of pages in buffer cache */
+	u_int64_t numfreepages; 	/* number of free pages */
+	u_int64_t numdirtypages; 	/* number of dirty free pages */
+	u_int64_t numcleanpages; 	/* number of clean free pages */
+	u_int64_t pendingwrites;	/* number of pending writes */
+	u_int64_t pendingreads;		/* number of pending reads */
+	u_int64_t numwrites;		/* total writes started */
+	u_int64_t numreads;		/* total reads started */
+	u_int64_t cachehits;		/* total reads found in cache */
 };
 #ifdef _KERNEL
 extern struct bcachestats bcstats;
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 39dcf82ce06..05e8ea07e08 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: namei.h,v 1.20 2007/08/07 07:41:59 thib Exp $	*/
+/*	$OpenBSD: namei.h,v 1.21 2008/07/05 12:56:52 thib Exp $	*/
 /*	$NetBSD: namei.h,v 1.11 1996/02/09 18:25:20 christos Exp $	*/
 
 /*
@@ -190,16 +190,18 @@ extern struct pool namei_pool;
  * Stats on usefulness of namei caches.
  */
 struct	nchstats {
-	long	ncs_goodhits;		/* hits that we can really use */
-	long	ncs_neghits;		/* negative hits that we can use */
-	long	ncs_badhits;		/* hits we must drop */
-	long	ncs_falsehits;		/* hits with id mismatch */
-	long	ncs_miss;		/* misses */
-	long	ncs_long;		/* long names that ignore cache */
-	long	ncs_pass2;		/* names found with passes == 2 */
-	long	ncs_2passes;		/* number of times we attempt it */
-	long    ncs_revhits;		/* reverse-cache hits */
-	long    ncs_revmiss;		/* reverse-cache misses */
+	u_int64_t	ncs_goodhits;	/* hits that we can really use */
+	u_int64_t	ncs_neghits;	/* negative hits that we can use */
+	u_int64_t	ncs_badhits;	/* hits we must drop */
+	u_int64_t	ncs_falsehits;	/* hits with id mismatch */
+	u_int64_t	ncs_miss;	/* misses */
+	u_int64_t	ncs_long;	/* long names that ignore cache */
+	u_int64_t	ncs_pass2;	/* names found with passes == 2 */
+	u_int64_t	ncs_2passes;	/* number of times we attempt it */
+	u_int64_t	ncs_revhits;	/* reverse-cache hits */
+	u_int64_t	ncs_revmiss;	/* reverse-cache misses */
+	u_int64_t	ncs_dothits;	/* hits on '.' lookups */
+	u_int64_t	ncs_dotdothits;	/* hits on '..' lookups */
 };
 
 /* These sysctl names are only really used by sysctl(8) */
@@ -213,19 +215,23 @@ struct	nchstats {
 #define KERN_NCHSTATS_2PASSES		8
 #define KERN_NCHSTATS_REVHITS           9
 #define KERN_NCHSTATS_REVMISS           10
-#define KERN_NCHSTATS_MAXID		11
+#define KERN_NCHSTATS_DOTHITS		11
+#define KERN_NCHSTATS_DOTDOTHITS	12
+#define KERN_NCHSTATS_MAXID		13
 
 #define CTL_KERN_NCHSTATS_NAMES {		\
 	{ 0, 0 },				\
-	{ "good_hits", CTLTYPE_INT },		\
-	{ "negative_hits", CTLTYPE_INT },	\
-	{ "bad_hits", CTLTYPE_INT },		\
-	{ "false_hits", CTLTYPE_INT },		\
-	{ "misses", CTLTYPE_INT },		\
-	{ "long_names", CTLTYPE_INT },		\
-	{ "pass2", CTLTYPE_INT },		\
-	{ "2passes", CTLTYPE_INT },		\
-	{ "ncs_revhits", CTLTYPE_INT },		\
-	{ "ncs_revmiss", CTLTYPE_INT },		\
+	{ "good_hits", CTLTYPE_QUAD },		\
+	{ "negative_hits", CTLTYPE_QUAD },	\
+	{ "bad_hits", CTLTYPE_QUAD },		\
+	{ "false_hits", CTLTYPE_QUAD },		\
+	{ "misses", CTLTYPE_QUAD },		\
+	{ "long_names", CTLTYPE_QUAD },		\
+	{ "pass2", CTLTYPE_QUAD },		\
+	{ "2passes", CTLTYPE_QUAD },		\
+	{ "ncs_revhits", CTLTYPE_QUAD },	\
+	{ "ncs_revmiss", CTLTYPE_QUAD },	\
+	{ "ncs_dothits", CTLTYPE_QUAD },	\
+	{ "nch_dotdothits", CTLTYPE_QUAD },	\
 }
 #endif /* !_SYS_NAMEI_H_ */