Changeset c47912f in mainline

Timestamp:

2006-04-04T09:04:15Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

448743f

Parents:

2a1fa51

Message:

Rename btree_node_left_sibling() to btree_leaf_node_left_neighbour()
and btree_node_right_sibling() to btree_leaf_node_right_neighbour()
as the left and right neighbours of a node needn't be its siblings.

Location:

generic

Files:

• include/adt/btree.h (modified) (1 diff)
• src/adt/btree.c (modified) (2 diffs)
• src/mm/as.c (modified) (5 diffs)

generic/include/adt/btree.h

@@ -84 +84 @@
 extern void *btree_search(btree_t *t, __native key, btree_node_t **leaf_node);
 
-extern btree_node_t *btree_node_left_sibling(btree_t *t, btree_node_t *node);
-extern btree_node_t *btree_node_right_sibling(btree_t *t, btree_node_t *node);
+extern btree_node_t *btree_leaf_node_left_neighbour(btree_t *t, btree_node_t *node);
+extern btree_node_t *btree_leaf_node_right_neighbour(btree_t *t, btree_node_t *node);
 
 extern void btree_print(btree_t *t);

generic/src/adt/btree.c

@@ -341 +341 @@
 }
 
-/** Return pointer to B-tree node's left sibling.
+/** Return pointer to B-tree leaf node's left neighbour.
  *
  * @param t B-tree.
- * @param node Node whose left sibling will be returned.
- *
- * @return Left sibling of the node or NULL if the node does not have the left sibling.
- */
-btree_node_t *btree_node_left_sibling(btree_t *t, btree_node_t *node)
+ * @param node Node whose left neighbour will be returned.
+ *
+ * @return Left neighbour of the node or NULL if the node does not have the left neighbour.
+ */
+btree_node_t *btree_leaf_node_left_neighbour(btree_t *t, btree_node_t *node)
 {
         ASSERT(LEAF_NODE(node));
@@ -357 +357 @@
 }
 
-/** Return pointer to B-tree node's right sibling.
+/** Return pointer to B-tree leaf node's right neighbour.
  *
  * @param t B-tree.
- * @param node Node whose right sibling will be returned.
- *
- * @return Right sibling of the node or NULL if the node does not have the right sibling.
- */
-btree_node_t *btree_node_right_sibling(btree_t *t, btree_node_t *node)
+ * @param node Node whose right neighbour will be returned.
+ *
+ * @return Right neighbour of the node or NULL if the node does not have the right neighbour.
+ */
+btree_node_t *btree_leaf_node_right_neighbour(btree_t *t, btree_node_t *node)
 {
         ASSERT(LEAF_NODE(node));

generic/src/mm/as.c

@@ -526 +526 @@
         
         /*
-         * Search the leaf node and the righmost record of its left sibling
+         * Search the leaf node and the righmost record of its left neighbour
          * to find out whether this is a miss or va belongs to an address
          * space area found there.
@@ -542 +542 @@
 
         /*
-         * Second, locate the left sibling and test its last record.
+         * Second, locate the left neighbour and test its last record.
          * Because of its position in the B+tree, it must have base < va.
          */
-        if ((lnode = btree_node_left_sibling(&as->as_area_btree, leaf))) {
+        if ((lnode = btree_leaf_node_left_neighbour(&as->as_area_btree, leaf))) {
                 a = (as_area_t *) lnode->value[lnode->keys - 1];
                 spinlock_lock(&a->lock);
@@ -584 +584 @@
          * the number of address space areas belonging to as.
          * The check for conflicts is then attempted on the rightmost
-         * record in the left sibling, the leftmost record in the right
-         * sibling and all records in the leaf node itself.
+         * record in the left neighbour, the leftmost record in the right
+         * neighbour and all records in the leaf node itself.
          */
         
@@ -594 +594 @@
         
         /* First, check the two border cases. */
-        if ((node = btree_node_left_sibling(&as->as_area_btree, leaf))) {
+        if ((node = btree_leaf_node_left_neighbour(&as->as_area_btree, leaf))) {
                 a = (as_area_t *) node->value[node->keys - 1];
                 spinlock_lock(&a->lock);
@@ -603 +603 @@
                 spinlock_unlock(&a->lock);
         }
-        if ((node = btree_node_right_sibling(&as->as_area_btree, leaf))) {
+        if ((node = btree_leaf_node_right_neighbour(&as->as_area_btree, leaf))) {
                 a = (as_area_t *) node->value[0];
                 spinlock_lock(&a->lock);