Changeset 152b2b0 in mainline for generic/src/mm/as.c

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.

File:

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

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