Changeset 6a44ee4 in mainline for kernel/generic/src/adt/btree.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/src/adt/btree.c (modified) (8 diffs)

kernel/generic/src/adt/btree.c

@@ -108 +108 @@
 void btree_create(btree_t *t)
 {
-        list_initialize(&t->leaf_head);
+        list_initialize(&t->leaf_list);
         t->root = (btree_node_t *) slab_alloc(btree_node_slab, 0);
         node_initialize(t->root);
-        list_append(&t->root->leaf_link, &t->leaf_head);
+        list_append(&t->root->leaf_link, &t->leaf_list);
 }
 
@@ -588 +588 @@
                 
                 if (LEAF_NODE(node)) {
-                        list_prepend(&rnode->leaf_link, &node->leaf_link);
+                        list_insert_after(&rnode->leaf_link, &node->leaf_link);
                 }
                 
@@ -953 +953 @@
         ASSERT(LEAF_NODE(node));
         
-        if (node->leaf_link.prev != &t->leaf_head)
+        if (node->leaf_link.prev != &t->leaf_list.head)
                 return list_get_instance(node->leaf_link.prev, btree_node_t, leaf_link);
         else
@@ -972 +972 @@
         ASSERT(LEAF_NODE(node));
         
-        if (node->leaf_link.next != &t->leaf_head)
+        if (node->leaf_link.next != &t->leaf_list.head)
                 return list_get_instance(node->leaf_link.next, btree_node_t, leaf_link);
         else
@@ -987 +987 @@
         size_t i;
         int depth = t->root->depth;
-        link_t head, *cur;
+        list_t list;
         
         printf("Printing B-tree:\n");
-        list_initialize(&head);
-        list_append(&t->root->bfs_link, &head);
+        list_initialize(&list);
+        list_append(&t->root->bfs_link, &list);
         
         /*
@@ -997 +997 @@
          * Levels are distinguished from one another by node->depth.
          */
-        while (!list_empty(&head)) {
+        while (!list_empty(&list)) {
                 link_t *hlp;
                 btree_node_t *node;
                 
-                hlp = head.next;
-                ASSERT(hlp != &head);
+                hlp = list_first(&list);
+                ASSERT(hlp != NULL);
                 node = list_get_instance(hlp, btree_node_t, bfs_link);
                 list_remove(hlp);
@@ -1018 +1018 @@
                         printf("%" PRIu64 "%s", node->key[i], i < node->keys - 1 ? "," : "");
                         if (node->depth && node->subtree[i]) {
-                                list_append(&node->subtree[i]->bfs_link, &head);
+                                list_append(&node->subtree[i]->bfs_link, &list);
                         }
                 }
                 
                 if (node->depth && node->subtree[i])
-                        list_append(&node->subtree[i]->bfs_link, &head);
+                        list_append(&node->subtree[i]->bfs_link, &list);
                 
                 printf(")");
@@ -1031 +1031 @@
         
         printf("Printing list of leaves:\n");
-        for (cur = t->leaf_head.next; cur != &t->leaf_head; cur = cur->next) {
+        list_foreach(t->leaf_list, cur) {
                 btree_node_t *node;