i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"it cannot fail"?? Hello, we're in the kernel here :-))

Browse Source 
Actually, it would be quite possible for another thread to specifically
ask for space in that reserved range, so we're playing safe now.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11177 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-02-01 00:07:26 +00:00
parent e4b4e8f554
commit a82d0abbd6
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/vm/vm.c
+9 -5
View File
@@ -2993,11 +2993,15 @@ transfer_area(area_id id, void **_address, uint32 addressSpec, team_id target)
reservedAddress = (void *)area->base; reservedAddress = (void *)area->base;
remove_area_from_virtual_map(sourceAddressSpace, area, true); remove_area_from_virtual_map(sourceAddressSpace, area, true);
insert_area(sourceAddressSpace, &reservedAddress, B_EXACT_ADDRESS, area->size, reserved); status = insert_area(sourceAddressSpace, &reservedAddress, B_EXACT_ADDRESS,
area->size, reserved);
// famous last words: this cannot fail :) // famous last words: this cannot fail :)
release_sem_etc(sourceAddressSpace->virtual_map.sem, WRITE_COUNT, 0); release_sem_etc(sourceAddressSpace->virtual_map.sem, WRITE_COUNT, 0);
if (status != B_OK)
goto err3;
// unmap the area in the source address space // unmap the area in the source address space
map = &sourceAddressSpace->translation_map; map = &sourceAddressSpace->translation_map;
map->ops->lock(map); map->ops->lock(map);
@@ -3012,12 +3016,12 @@ transfer_area(area_id id, void **_address, uint32 addressSpec, team_id target)
// okay, someone is trying to delete this aspace now, so we can't // okay, someone is trying to delete this aspace now, so we can't
// insert the area, so back out // insert the area, so back out
status = B_BAD_TEAM_ID; status = B_BAD_TEAM_ID;
goto err3; goto err4;
} }
status = insert_area(targetAddressSpace, _address, addressSpec, area->size, area); status = insert_area(targetAddressSpace, _address, addressSpec, area->size, area);
if (status < B_OK) if (status < B_OK)
goto err3; goto err4;
// The area was successfully transferred to the new team when we got here // The area was successfully transferred to the new team when we got here
area->aspace = targetAddressSpace; area->aspace = targetAddressSpace;
@@ -3032,9 +3036,9 @@ transfer_area(area_id id, void **_address, uint32 addressSpec, team_id target)
return B_OK; return B_OK;
err3: err4:
release_sem_etc(targetAddressSpace->virtual_map.sem, WRITE_COUNT, 0); release_sem_etc(targetAddressSpace->virtual_map.sem, WRITE_COUNT, 0);
err3:
// insert the area again into the source address space // insert the area again into the source address space
acquire_sem_etc(sourceAddressSpace->virtual_map.sem, WRITE_COUNT, 0, 0); acquire_sem_etc(sourceAddressSpace->virtual_map.sem, WRITE_COUNT, 0, 0);
// check to see if this aspace has entered DELETE state // check to see if this aspace has entered DELETE state