Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added vm_delete_aspace() again - unlike before, it now also puts the last

Browse Source 
reference to the address space, so that the calling team deletion function
doesn't have to do this.
delete_address_space() doesn't have to delete any areas anymore, since
at the point it's called, there is no area anymore, anyway: each area
holds a reference to the address space.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9276 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-10-10 17:21:38 +00:00
parent 05ab7b5c32
commit b9d74a6b88
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/kernel/core/vm/vm_address_space.c
View File

@ -165,10 +165,17 @@ aspace_hash(void *_a, const void *key, uint32 range)
} }
/** When this function is called, all references to this address space
* have been released, so it's safe to remove it.
*/
static void static void
delete_address_space(vm_address_space *aspace) delete_address_space(vm_address_space *aspace)
{ {
TRACE(("vm_delete_aspace: called on aspace 0x%lx\n", aspace->id)); TRACE(("delete_address_space: called on aspace 0x%lx\n", aspace->id));
if (aspace == kernel_aspace)
panic("tried to delete the kernel aspace!\n");
// put this aspace in the deletion state // put this aspace in the deletion state
// this guarantees that no one else will add regions to the list // this guarantees that no one else will add regions to the list
@ -176,8 +183,6 @@ delete_address_space(vm_address_space *aspace)
aspace->state = VM_ASPACE_STATE_DELETION; aspace->state = VM_ASPACE_STATE_DELETION;
vm_delete_areas(aspace);
(*aspace->translation_map.ops->destroy)(&aspace->translation_map); (*aspace->translation_map.ops->destroy)(&aspace->translation_map);
free(aspace->name); free(aspace->name);
@ -244,25 +249,37 @@ vm_get_current_user_aspace_id(void)
void void
vm_put_aspace(vm_address_space *aspace) vm_put_aspace(vm_address_space *aspace)
{ {
// vm_region *region; bool remove = false;
bool removeit = false;
acquire_sem_etc(aspace_hash_sem, WRITE_COUNT, 0, 0); acquire_sem_etc(aspace_hash_sem, WRITE_COUNT, 0, 0);
if (atomic_add(&aspace->ref_count, -1) == 1) { if (atomic_add(&aspace->ref_count, -1) == 1) {
hash_remove(aspace_table, aspace); hash_remove(aspace_table, aspace);
removeit = true; remove = true;
} }
release_sem_etc(aspace_hash_sem, WRITE_COUNT, 0); release_sem_etc(aspace_hash_sem, WRITE_COUNT, 0);
if (!removeit) if (remove)
return; delete_address_space(aspace);
}
TRACE(("vm_put_aspace: reached zero ref, deleting aspace\n"));
if (aspace == kernel_aspace) /** Deletes all areas in the specified address space, and the address
panic("vm_put_aspace: tried to delete the kernel aspace!\n"); * space by decreasing all reference counters. It also marks the
* address space of being in deletion state, so that no more areas
* can be created in it.
* After this, the address space is not operational anymore, but might
* still be in memory until the last reference has been released.
*/
delete_address_space(aspace); void
vm_delete_aspace(vm_address_space *aspace)
{
acquire_sem_etc(aspace->virtual_map.sem, WRITE_COUNT, 0, 0);
aspace->state = VM_ASPACE_STATE_DELETION;
release_sem_etc(aspace->virtual_map.sem, WRITE_COUNT, 0);
vm_delete_areas(aspace);
vm_put_aspace(aspace);
} }