Author: alc
Date: Tue Mar 26 17:30:40 2013
New Revision: 248728
URL: http://svnweb.freebsd.org/changeset/base/248728
Log:
Introduce vm_radix_isleaf() and use it in a couple places. As compared to
using vm_radix_node_page() == NULL, the compiler is able to generate one
less conditional branch when vm_radix_isleaf() is used. More use cases
involving the inner loops of vm_radix_insert(), vm_radix_lookup{,_ge,_le}(),
and vm_radix_remove() will follow.
Reviewed by: attilio
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sys/vm/vm_radix.c
Modified: head/sys/vm/vm_radix.c
==============================================================================
--- head/sys/vm/vm_radix.c Tue Mar 26 16:38:03 2013 (r248727)
+++ head/sys/vm/vm_radix.c Tue Mar 26 17:30:40 2013 (r248728)
@@ -189,6 +189,16 @@ vm_radix_setroot(struct vm_radix *rtree,
}
/*
+ * Returns TRUE if the specified radix node is a leaf and FALSE otherwise.
+ */
+static __inline boolean_t
+vm_radix_isleaf(struct vm_radix_node *rnode)
+{
+
+ return (((uintptr_t)rnode & VM_RADIX_ISLEAF) != 0);
+}
+
+/*
* Returns the associated page extracted from rnode if available,
* and NULL otherwise.
*/
@@ -315,7 +325,7 @@ vm_radix_reclaim_allnodes_int(struct vm_
for (slot = 0; rnode->rn_count != 0; slot++) {
if (rnode->rn_child[slot] == NULL)
continue;
- if (vm_radix_node_page(rnode->rn_child[slot]) == NULL)
+ if (!vm_radix_isleaf(rnode->rn_child[slot]))
vm_radix_reclaim_allnodes_int(rnode->rn_child[slot]);
rnode->rn_child[slot] = NULL;
rnode->rn_count--;
@@ -454,7 +464,7 @@ vm_radix_insert(struct vm_radix *rtree,
__func__, clev, rnode->rn_clev));
slot = vm_radix_slot(index, rnode->rn_clev);
tmp = rnode->rn_child[slot];
- KASSERT(tmp != NULL && vm_radix_node_page(tmp) == NULL,
+ KASSERT(tmp != NULL && !vm_radix_isleaf(tmp),
("%s: unexpected lookup interruption", __func__));
if (tmp->rn_clev > clev)
break;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
