Module Name: src
Committed By: mlelstv
Date: Sun Jan 3 09:42:22 UTC 2010
Modified Files:
src/sys/kern: subr_pool.c
Log Message:
drop __predict micro optimization in pool_init for cleaner code.
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/kern/subr_pool.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.180 src/sys/kern/subr_pool.c:1.181
--- src/sys/kern/subr_pool.c:1.180 Sun Jan 3 01:07:19 2010
+++ src/sys/kern/subr_pool.c Sun Jan 3 09:42:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.180 2010/01/03 01:07:19 mlelstv Exp $ */
+/* $NetBSD: subr_pool.c,v 1.181 2010/01/03 09:42:22 mlelstv Exp $ */
/*-
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.180 2010/01/03 01:07:19 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.181 2010/01/03 09:42:22 mlelstv Exp $");
#include "opt_ddb.h"
#include "opt_pool.h"
@@ -855,7 +855,7 @@
}
/* Insert into the list of all pools. */
- if (__predict_true(!cold))
+ if (!cold)
mutex_enter(&pool_head_lock);
TAILQ_FOREACH(pp1, &pool_head, pr_poollist) {
if (strcmp(pp1->pr_wchan, pp->pr_wchan) > 0)
@@ -865,14 +865,14 @@
TAILQ_INSERT_TAIL(&pool_head, pp, pr_poollist);
else
TAILQ_INSERT_BEFORE(pp1, pp, pr_poollist);
- if (__predict_true(!cold))
+ if (!cold)
mutex_exit(&pool_head_lock);
/* Insert this into the list of pools using this allocator. */
- if (__predict_true(!cold))
+ if (!cold)
mutex_enter(&palloc->pa_lock);
TAILQ_INSERT_TAIL(&palloc->pa_list, pp, pr_alloc_list);
- if (__predict_true(!cold))
+ if (!cold)
mutex_exit(&palloc->pa_lock);
pool_reclaim_register(pp);
