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

We can return directly as we use handy locker objects. Adjusted and added

Browse Source 
comments.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32483 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2009-08-17 22:51:01 +00:00
parent a245e6b444
commit 65411f56b7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/system/kernel/heap.cpp
View File

@ -1462,12 +1462,12 @@ heap_free(heap_allocator *heap, void *address)
// smaller than our address to become our only candidate for freeing // smaller than our address to become our only candidate for freeing
if (area->base <= (addr_t)address) { if (area->base <= (addr_t)address) {
if ((addr_t)address >= area->base + area->size) { if ((addr_t)address >= area->base + area->size) {
// the only candidate area doesn't contain the address, // none of the other areas can contain the address as the list
// set it to NULL so we return below (none of the other areas // is ordered
// can contain the address as the list is ordered) return B_ENTRY_NOT_FOUND;
area = NULL;
} }
// this area contains the allocation, we're done searching
break; break;
} }
@ -1621,7 +1621,7 @@ static status_t
heap_realloc(heap_allocator *heap, void *address, void **newAddress, heap_realloc(heap_allocator *heap, void *address, void **newAddress,
size_t newSize) size_t newSize)
{ {
ReadLocker heapReadLocker(heap->area_lock); ReadLocker areaReadLocker(heap->area_lock);
heap_area *area = heap->all_areas; heap_area *area = heap->all_areas;
while (area) { while (area) {
// since the all_areas list is ordered by base with the biggest // since the all_areas list is ordered by base with the biggest
@ -1630,12 +1630,12 @@ heap_realloc(heap_allocator *heap, void *address, void **newAddress,
// reallocating // reallocating
if (area->base <= (addr_t)address) { if (area->base <= (addr_t)address) {
if ((addr_t)address >= area->base + area->size) { if ((addr_t)address >= area->base + area->size) {
// the only candidate area doesn't contain the address, // none of the other areas can contain the address as the list
// set it to NULL so we return below (none of the other areas // is ordered
// can contain the address as the list is ordered) return B_ENTRY_NOT_FOUND;
area = NULL;
} }
// this area contains the allocation, we're done searching
break; break;
} }
@ -1683,7 +1683,7 @@ heap_realloc(heap_allocator *heap, void *address, void **newAddress,
} }
} }
heapReadLocker.Unlock(); areaReadLocker.Unlock();
#if KERNEL_HEAP_LEAK_CHECK #if KERNEL_HEAP_LEAK_CHECK
newSize += sizeof(heap_leak_check_info); newSize += sizeof(heap_leak_check_info);