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

* Fixed compilation with PARANOID_HEAP_VALIDATION turned on.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35507 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2010-02-17 15:40:02 +00:00
parent 33eead339b
commit 8941a2ba08
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1375,7 +1375,8 @@ heap_allocate_contiguous_pages(heap_allocator *heap, uint32 pageCount,
#if KERNEL_HEAP_LEAK_CHECK #if KERNEL_HEAP_LEAK_CHECK
static void static void
heap_add_leak_check_info(addr_t address, size_t allocated, size_t size) heap_add_leak_check_info(heap_allocator *heap, addr_t address, size_t allocated,
size_t size)
{ {
heap_leak_check_info *info = (heap_leak_check_info *)(address + allocated heap_leak_check_info *info = (heap_leak_check_info *)(address + allocated
- sizeof(heap_leak_check_info)); - sizeof(heap_leak_check_info));
@ -1404,7 +1405,7 @@ heap_raw_alloc(heap_allocator *heap, size_t size, size_t alignment)
addr_t address = firstPage->area->base + firstPage->index * heap->page_size; addr_t address = firstPage->area->base + firstPage->index * heap->page_size;
#if KERNEL_HEAP_LEAK_CHECK #if KERNEL_HEAP_LEAK_CHECK
heap_add_leak_check_info(address, pageCount * heap->page_size, size); heap_add_leak_check_info(heap, address, pageCount * heap->page_size, size);
#endif #endif
return (void *)address; return (void *)address;
} }
@ -1475,7 +1476,7 @@ heap_allocate_from_bin(heap_allocator *heap, uint32 binIndex, size_t size)
#if KERNEL_HEAP_LEAK_CHECK #if KERNEL_HEAP_LEAK_CHECK
binLocker.Unlock(); binLocker.Unlock();
heap_add_leak_check_info((addr_t)address, bin->element_size, size); heap_add_leak_check_info(heap, (addr_t)address, bin->element_size, size);
#endif #endif
return address; return address;
} }