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

Sync two locking changes from kernel heap. This just moves the page locking into

Browse Source 
the contiguous page allocation function and unlocks a bin locker a bit earlier.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35424 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2010-02-07 02:02:13 +00:00
parent b7d3ddaa0e
commit 160abe2685
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/libroot/posix/malloc_debug/heap.cpp
+2 -1
View File
@@ -919,6 +919,7 @@ static heap_page *
heap_allocate_contiguous_pages(heap_allocator *heap, uint32 pageCount, heap_allocate_contiguous_pages(heap_allocator *heap, uint32 pageCount,
size_t alignment) size_t alignment)
{ {
MutexLocker pageLocker(heap->page_lock);
heap_area *area = heap->areas; heap_area *area = heap->areas;
while (area) { while (area) {
if (area->free_page_count < pageCount) { if (area->free_page_count < pageCount) {
@@ -1000,7 +1001,6 @@ heap_raw_alloc(heap_allocator *heap, size_t size, size_t alignment)
INFO(("heap %p: allocate %lu bytes from raw pages with alignment %lu\n", INFO(("heap %p: allocate %lu bytes from raw pages with alignment %lu\n",
heap, size, alignment)); heap, size, alignment));
MutexLocker pageLocker(heap->page_lock);
uint32 pageCount = (size + heap->page_size - 1) / heap->page_size; uint32 pageCount = (size + heap->page_size - 1) / heap->page_size;
heap_page *firstPage = heap_allocate_contiguous_pages(heap, pageCount, heap_page *firstPage = heap_allocate_contiguous_pages(heap, pageCount,
alignment); alignment);
@@ -1079,6 +1079,7 @@ heap_allocate_from_bin(heap_allocator *heap, uint32 binIndex, size_t size)
page->next = page->prev = NULL; page->next = page->prev = NULL;
} }
binLocker.Unlock();
heap_add_leak_check_info((addr_t)address, bin->element_size, size); heap_add_leak_check_info((addr_t)address, bin->element_size, size);
return address; return address;
} }