Changeset c47912f in mainline for generic/src/mm/as.c

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.

File:

• generic/src/mm/as.c (modified) (5 diffs)

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);