[src/trunk]: src/sys/kern Make parts of this this somewhat less gross by usin...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5833cd001370
branches:  trunk
changeset: 770133:5833cd001370
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Wed Oct 05 01:53:03 2011 +0000

description:
Make parts of this this somewhat less gross by using ilog2() from
<sys/bitops.h>.  Additionally, concoct shorter wchan names for >=1 MiB
buf pools using the irrelevantly-more-correct format specifier for u_int.

diffstat:

 sys/kern/vfs_bio.c |  31 +++++++++++--------------------
 1 files changed, 11 insertions(+), 20 deletions(-)

diffs (67 lines):

diff -r 4c14a300f967 -r 5833cd001370 sys/kern/vfs_bio.c
--- a/sys/kern/vfs_bio.c        Tue Oct 04 21:12:40 2011 +0000
+++ b/sys/kern/vfs_bio.c        Wed Oct 05 01:53:03 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_bio.c,v 1.231 2011/07/11 08:27:37 hannken Exp $    */
+/*     $NetBSD: vfs_bio.c,v 1.232 2011/10/05 01:53:03 jakllsch Exp $   */
 
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -123,7 +123,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.231 2011/07/11 08:27:37 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.232 2011/10/05 01:53:03 jakllsch Exp $");
 
 #include "opt_bufcache.h"
 
@@ -142,6 +142,7 @@
 #include <sys/intr.h>
 #include <sys/cpu.h>
 #include <sys/wapbl.h>
+#include <sys/bitops.h>
 
 #include <uvm/uvm.h>   /* extern struct uvm uvm */
 
@@ -215,21 +216,9 @@
 static pool_cache_t buf_cache;
 static pool_cache_t bufio_cache;
 
-/* XXX - somewhat gross.. */
-#if MAXBSIZE == 0x2000
-#define NMEMPOOLS 5
-#elif MAXBSIZE == 0x4000
-#define NMEMPOOLS 6
-#elif MAXBSIZE == 0x8000
-#define NMEMPOOLS 7
-#else
-#define NMEMPOOLS 8
-#endif
-
-#define MEMPOOL_INDEX_OFFSET 9 /* smallest pool is 512 bytes */
-#if (1 << (NMEMPOOLS + MEMPOOL_INDEX_OFFSET - 1)) != MAXBSIZE
-#error update vfs_bio buffer memory parameters
-#endif
+#define MEMPOOL_INDEX_OFFSET (ilog2(DEV_BSIZE))        /* smallest pool is 512 bytes */
+#define NMEMPOOLS (ilog2(MAXBSIZE) - MEMPOOL_INDEX_OFFSET + 1)
+__CTASSERT((1 << (NMEMPOOLS + MEMPOOL_INDEX_OFFSET - 1)) == MAXBSIZE);
 
 /* Buffer memory pools */
 static struct pool bmempools[NMEMPOOLS];
@@ -491,10 +480,12 @@
                struct pool *pp = &bmempools[i];
                u_int size = 1 << (i + MEMPOOL_INDEX_OFFSET);
                char *name = kmem_alloc(8, KM_SLEEP); /* XXX: never freed */
-               if (__predict_true(size >= 1024))
-                       (void)snprintf(name, 8, "buf%dk", size / 1024);
+               if (__predict_false(size >= 1048576))
+                       (void)snprintf(name, 8, "buf%um", size / 1048576);
+               else if (__predict_true(size >= 1024))
+                       (void)snprintf(name, 8, "buf%uk", size / 1024);
                else
-                       (void)snprintf(name, 8, "buf%db", size);
+                       (void)snprintf(name, 8, "buf%ub", size);
                pa = (size <= PAGE_SIZE && use_std)
                        ? &pool_allocator_nointr
                        : &bufmempool_allocator;