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

mmlr+axeld:

Browse Source 
* Fixed some minor issues of heap_create_allocator() when it should use the
  kernel heap to allocate its heap structure.
* Fixed an off by one error in the max bin check.
* Changed the KDL "heap" command to allow the "stats" for any heap as well.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33725 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-10-22 12:30:53 +00:00
parent 6bb413270b
commit 4e61885e4a
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,6 @@
/* /*
* Copyright 2008-2009, Michael Lotz, mmlr@mlotz.ch. * Copyright 2008-2009, Michael Lotz, mmlr@mlotz.ch.
* Distributed under the terms of the MIT License. * Copyright 2002-2009, Axel Dörfler, axeld@pinc-software.de.
*
* Copyright 2002-2006, Axel Dörfler, axeld@pinc-software.de.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Copyright 2001, Travis Geiselbrecht. All rights reserved. * Copyright 2001, Travis Geiselbrecht. All rights reserved.
@ -361,26 +359,35 @@ dump_allocator(heap_allocator *heap, bool areas, bool bins)
static int static int
dump_heap_list(int argc, char **argv) dump_heap_list(int argc, char **argv)
{ {
if (argc == 2) { if (argc == 2 && strcmp(argv[1], "grow") == 0) {
uint64 heapAddress; // only dump dedicated grow heap info
kprintf("dedicated grow heap:\n");
if (strcmp(argv[1], "grow") == 0) { dump_allocator(sGrowHeap, true, true);
// only dump dedicated grow heap info
kprintf("dedicated grow heap:\n");
dump_allocator(sGrowHeap, true, true);
} else if (strcmp(argv[1], "stats") == 0) {
for (uint32 i = 0; i < sHeapCount; i++)
dump_allocator(sHeaps[i], false, false);
} else if (evaluate_debug_expression(argv[1], &heapAddress, true)) {
dump_allocator((heap_allocator*)(addr_t)heapAddress, true, true);
} else
print_debugger_command_usage(argv[0]);
return 0; return 0;
} }
for (uint32 i = 0; i < sHeapCount; i++) bool stats = false;
dump_allocator(sHeaps[i], true, true); int i = 1;
if (strcmp(argv[1], "stats") == 0) {
stats = true;
i++;
}
uint64 heapAddress = 0;
if (i < argc && !evaluate_debug_expression(argv[i], &heapAddress, true)) {
print_debugger_command_usage(argv[0]);
return 0;
}
if (heapAddress == 0) {
// dump default kernel heaps
for (uint32 i = 0; i < sHeapCount; i++)
dump_allocator(sHeaps[i], !stats, !stats);
} else {
// dump specified heap
dump_allocator((heap_allocator*)(addr_t)heapAddress, !stats, !stats);
}
return 0; return 0;
} }
@ -1121,7 +1128,7 @@ heap_create_allocator(const char *name, addr_t base, size_t size,
heap->page_size = heapClass->page_size; heap->page_size = heapClass->page_size;
heap->total_pages = heap->total_free_pages = heap->empty_areas = 0; heap->total_pages = heap->total_free_pages = heap->empty_areas = 0;
heap->areas = heap->all_areas = NULL; heap->areas = heap->all_areas = NULL;
heap->bins = (heap_bin *)base; heap->bins = (heap_bin *)((addr_t)heap + sizeof(heap_allocator));
#if KERNEL_HEAP_LEAK_CHECK #if KERNEL_HEAP_LEAK_CHECK
heap->get_caller = &get_caller; heap->get_caller = &get_caller;
@ -1131,6 +1138,9 @@ heap_create_allocator(const char *name, addr_t base, size_t size,
size_t binSize = 0, lastSize = 0; size_t binSize = 0, lastSize = 0;
uint32 count = heap->page_size / heapClass->min_bin_size; uint32 count = heap->page_size / heapClass->min_bin_size;
for (; count >= heapClass->min_count_per_page; count--, lastSize = binSize) { for (; count >= heapClass->min_count_per_page; count--, lastSize = binSize) {
if (heap->bin_count >= MAX_BIN_COUNT)
panic("heap configuration invalid - max bin count reached\n");
binSize = (heap->page_size / count) & ~(heapClass->bin_alignment - 1); binSize = (heap->page_size / count) & ~(heapClass->bin_alignment - 1);
if (binSize == lastSize) if (binSize == lastSize)
continue; continue;
@ -1143,13 +1153,12 @@ heap_create_allocator(const char *name, addr_t base, size_t size,
bin->max_free_count = heap->page_size / binSize; bin->max_free_count = heap->page_size / binSize;
bin->page_list = NULL; bin->page_list = NULL;
heap->bin_count++; heap->bin_count++;
if (heap->bin_count > MAX_BIN_COUNT)
panic("heap configuration invalid - max bin count reached\n");
}; };
base += heap->bin_count * sizeof(heap_bin); if (!allocateOnHeap) {
size -= heap->bin_count * sizeof(heap_bin); base += heap->bin_count * sizeof(heap_bin);
size -= heap->bin_count * sizeof(heap_bin);
}
rw_lock_init(&heap->area_lock, "heap area rw lock"); rw_lock_init(&heap->area_lock, "heap area rw lock");
mutex_init(&heap->page_lock, "heap page lock"); mutex_init(&heap->page_lock, "heap page lock");