Changeset 152b2b0 in mainline

Timestamp:

2006-06-01T14:11:29Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7c95658c

Parents:

bd571f44

Message:

Implement recursive function for deallocating the whole B+tree.
Make use of this function in address space management.

Location:

generic/src

Files:

• adt/btree.c (modified) (3 diffs)
• mm/as.c (modified) (3 diffs)

generic/src/adt/btree.c

@@ -51 +51 @@
 #include <print.h>
 
+static void btree_destroy_subtree(btree_node_t *root);
 static void _btree_insert(btree_t *t, btree_key_t key, void *value, btree_node_t *rsubtree, btree_node_t *node);
 static void _btree_remove(btree_t *t, btree_key_t key, btree_node_t *node);
@@ -102 +103 @@
 void btree_destroy(btree_t *t)
 {
-        ASSERT(!t->root->keys);
-        slab_free(btree_node_slab, t->root);
+        btree_destroy_subtree(t->root);
 }
 
@@ -127 +127 @@
         
         _btree_insert(t, key, value, NULL, lnode);
+}
+
+/** Destroy subtree rooted in a node.
+ *
+ * @param root Root of the subtree.
+ */
+void btree_destroy_subtree(btree_node_t *root)
+{
+        int i;
+
+        if (root->keys) {
+                for (i = 0; i < root->keys + 1; i++) { 
+                        if (root->subtree[i])
+                                btree_destroy_subtree(root->subtree[i]);
+                }
+        }
+        slab_free(btree_node_slab, root);
 }
 

generic/src/mm/as.c

@@ -162 +162 @@
                 ASSERT(!list_empty(&as->as_area_btree.leaf_head));
                 node = list_get_instance(&as->as_area_btree.leaf_head.next, btree_node_t, leaf_link);
-                if ((cond = node->keys)) {
+                if ((cond = node->keys))
                         as_area_destroy(as, node->key[0]);
-                        btree_remove(&as->as_area_btree, node->key[0], node);
-                }
-        }
-        
+        }
+        
+        btree_destroy(&as->as_area_btree);
         page_table_destroy(as->page_table);
 
@@ -461 +460 @@
                                 page_table_unlock(as, false);
                         }
-                        if (!used_space_remove(area, b, i))
-                                panic("Could not remove used space.\n");
                 }
         }
@@ -1490 +1487 @@
                         if ((cond = node->keys)) {
                                 frame_free(ADDR2PFN((__address) node->value[0]));
-                                btree_remove(&sh_info->pagemap, node->key[0], node);
                         }
                 }