Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.50.2.12
retrieving revision 1.75
diff -u -p -r1.50.2.12 -r1.75
--- src/sys/kern/subr_pool.c	2002/11/11 22:13:58	1.50.2.12
+++ src/sys/kern/subr_pool.c	2002/03/13 08:12:58	1.75
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.50.2.12 2002/11/11 22:13:58 nathanw Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.75 2002/03/13 08:12:58 simonb Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.50.2.12 2002/11/11 22:13:58 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.75 2002/03/13 08:12:58 simonb Exp $");
 
 #include "opt_pool.h"
 #include "opt_poollog.h"
@@ -94,7 +94,7 @@ struct pool_item_header {
 	TAILQ_HEAD(,pool_item)	ph_itemlist;	/* chunk list for this page */
 	LIST_ENTRY(pool_item_header)
 				ph_hashlist;	/* Off-page page headers */
-	unsigned int		ph_nmissing;	/* # of chunks in use */
+	int			ph_nmissing;	/* # of chunks in use */
 	caddr_t			ph_page;	/* this page's address */
 	struct timeval		ph_time;	/* last referenced */
 };
@@ -102,9 +102,9 @@ TAILQ_HEAD(pool_pagelist,pool_item_heade
 
 struct pool_item {
 #ifdef DIAGNOSTIC
-	u_int pi_magic;
+	int pi_magic;
 #endif
-#define	PI_MAGIC 0xdeadbeefU
+#define	PI_MAGIC 0xdeadbeef
 	/* Other entries use only this list entry */
 	TAILQ_ENTRY(pool_item)	pi_list;
 };
@@ -145,6 +145,16 @@ struct pool_item {
 /* The cache group pool. */
 static struct pool pcgpool;
 
+/* The pool cache group. */
+#define	PCG_NOBJECTS		16
+struct pool_cache_group {
+	TAILQ_ENTRY(pool_cache_group)
+		pcg_list;	/* link in the pool cache's group list */
+	u_int	pcg_avail;	/* # available objects */
+				/* pointers to the objects */
+	void	*pcg_objects[PCG_NOBJECTS];
+};
+
 static void	pool_cache_reclaim(struct pool_cache *);
 
 static int	pool_catchup(struct pool *);
@@ -415,7 +425,7 @@ pool_init(struct pool *pp, size_t size, 
 	if (size < sizeof(struct pool_item))
 		size = sizeof(struct pool_item);
 
-	size = roundup(size, align);
+	size = ALIGN(size);
 #ifdef DIAGNOSTIC
 	if (size > palloc->pa_pagesz)
 		panic("pool_init: pool item size (%lu) too large",
@@ -564,7 +574,7 @@ pool_destroy(struct pool *pp)
 #ifdef DIAGNOSTIC
 	if (pp->pr_nout != 0) {
 		pr_printlog(pp, NULL, printf);
-		panic("pool_destroy: pool busy: still out: %u",
+		panic("pool_destroy: pool busy: still out: %u\n",
 		    pp->pr_nout);
 	}
 #endif
@@ -634,9 +644,9 @@ pool_get(struct pool *pp, int flags)
 	void *v;
 
 #ifdef DIAGNOSTIC
-	if (__predict_false(curlwp == NULL && doing_shutdown == 0 &&
+	if (__predict_false(curproc == NULL && doing_shutdown == 0 &&
 			    (flags & PR_WAITOK) != 0))
-		panic("pool_get: %s: must have NOWAIT", pp->pr_wchan);
+		panic("pool_get: must have NOWAIT");
 
 #ifdef LOCKDEBUG
 	if (flags & PR_WAITOK)
@@ -715,7 +725,7 @@ pool_get(struct pool *pp, int flags)
 			simple_unlock(&pp->pr_slock);
 			printf("pool_get: %s: curpage NULL, nitems %u\n",
 			    pp->pr_wchan, pp->pr_nitems);
-			panic("pool_get: nitems inconsistent");
+			panic("pool_get: nitems inconsistent\n");
 		}
 #endif
 
@@ -785,7 +795,7 @@ pool_get(struct pool *pp, int flags)
 		simple_unlock(&pp->pr_slock);
 		printf("pool_get: %s: items on itemlist, nitems %u\n",
 		    pp->pr_wchan, pp->pr_nitems);
-		panic("pool_get: nitems inconsistent");
+		panic("pool_get: nitems inconsistent\n");
 	}
 #endif
 
@@ -916,7 +926,6 @@ pool_do_put(struct pool *pp, void *v)
 #endif
 
 	TAILQ_INSERT_HEAD(&ph->ph_itemlist, pi, pi_list);
-	KDASSERT(ph->ph_nmissing != 0);
 	ph->ph_nmissing--;
 	pp->pr_nput++;
 	pp->pr_nitems++;
@@ -1126,8 +1135,6 @@ pool_prime_page(struct pool *pp, caddr_t
 	while (n--) {
 		pi = (struct pool_item *)cp;
 
-		KASSERT(((((vaddr_t)pi) + ioff) & (align - 1)) == 0);
-
 		/* Insert on page list */
 		TAILQ_INSERT_TAIL(&ph->ph_itemlist, pi, pi_list);
 #ifdef DIAGNOSTIC
@@ -1425,6 +1432,7 @@ pool_print1(struct pool *pp, const char 
 			print_pagelist = 1;
 		if (c == 'c')
 			print_cache = 1;
+		modif++;
 	}
 
 	(*pr)("POOL %s: size %u, align %u, ioff %u, roflags 0x%08x\n",