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

* Add a "stats" argument to the kernel heap leak checker to only print the

Browse Source 
total count of allocations and bytes.
* Also add a few more bin sizes (for 8, 24 and 48 bytes) turns out especially
  allocations of 20-24 bytes are pretty common. And as it only wastes a few
  bytes per page this doesn't hurt at all.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23961 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2008-02-14 23:16:50 +00:00
parent 4f045f9cba
commit aabef40563
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/heap.cpp
+23 -15
View File
@@ -225,18 +225,18 @@ dump_allocations(int argc, char **argv)
{ {
team_id team = -1; team_id team = -1;
thread_id thread = -1; thread_id thread = -1;
if (argc == 3) { bool statsOnly = false;
if (strcmp(argv[1], "team") == 0) for (int32 i = 1; i < argc; i++) {
team = strtoul(argv[2], NULL, 0); if (strcmp(argv[i], "team") == 0)
else if (strcmp(argv[1], "thread") == 0) team = strtoul(argv[++i], NULL, 0);
thread = strtoul(argv[2], NULL, 0); else if (strcmp(argv[i], "thread") == 0)
thread = strtoul(argv[++i], NULL, 0);
else if (strcmp(argv[i], "stats") == 0)
statsOnly = true;
else { else {
print_debugger_command_usage(argv[0]); print_debugger_command_usage(argv[0]);
return 0; return 0;
} }
} else if (argc != 1) {
print_debugger_command_usage(argv[0]);
return 0;
} }
size_t totalSize = 0; size_t totalSize = 0;
@@ -275,8 +275,11 @@ dump_allocations(int argc, char **argv)
|| (team == -1 && info->thread == thread) || (team == -1 && info->thread == thread)
|| (thread == -1 && info->team == team)) { || (thread == -1 && info->team == team)) {
// interesting... // interesting...
dprintf("team: % 6ld; thread: % 6ld; address: 0x%08lx; size: %lu bytes\n", if (!statsOnly) {
info->team, info->thread, base, info->size); dprintf("team: % 6ld; thread: % 6ld; address: 0x%08lx; size: %lu bytes\n",
info->team, info->thread, base, info->size);
}
totalSize += info->size; totalSize += info->size;
totalCount++; totalCount++;
} }
@@ -297,8 +300,11 @@ dump_allocations(int argc, char **argv)
|| (team == -1 && info->thread == thread) || (team == -1 && info->thread == thread)
|| (thread == -1 && info->team == team)) { || (thread == -1 && info->team == team)) {
// interesting... // interesting...
dprintf("team: % 6ld; thread: % 6ld; address: 0x%08lx; size: %lu bytes\n", if (!statsOnly) {
info->team, info->thread, base, info->size); dprintf("team: % 6ld; thread: % 6ld; address: 0x%08lx; size: %lu bytes\n",
info->team, info->thread, base, info->size);
}
totalSize += info->size; totalSize += info->size;
totalCount++; totalCount++;
} }
@@ -439,7 +445,7 @@ heap_attach(addr_t base, size_t size, bool postSem)
base += sizeof(heap_allocator); base += sizeof(heap_allocator);
size -= sizeof(heap_allocator); size -= sizeof(heap_allocator);
size_t binSizes[] = { 16, 32, 64, 96, 128, 192, 256, 384, 512, 1024, 2048, B_PAGE_SIZE }; size_t binSizes[] = { 8, 16, 24, 32, 48, 64, 96, 128, 192, 256, 384, 512, 1024, 2048, B_PAGE_SIZE };
uint32 binCount = sizeof(binSizes) / sizeof(binSizes[0]); uint32 binCount = sizeof(binSizes) / sizeof(binSizes[0]);
heap->bin_count = binCount; heap->bin_count = binCount;
heap->bins = (heap_bin *)base; heap->bins = (heap_bin *)base;
@@ -995,11 +1001,13 @@ heap_init(addr_t base, size_t size)
add_debugger_command("heap", &dump_heap_list, "Dump stats about the kernel heap(s)"); add_debugger_command("heap", &dump_heap_list, "Dump stats about the kernel heap(s)");
#if KERNEL_HEAP_LEAK_CHECK #if KERNEL_HEAP_LEAK_CHECK
add_debugger_command_etc("allocations", &dump_allocations, add_debugger_command_etc("allocations", &dump_allocations,
"Dump current allocations", "[(\"team\" | \"thread\") <id>]\n" "Dump current allocations", "[(\"team\" | \"thread\") <id>] [\"stats\"]\n"
"If no parameters are given, all current alloactions are dumped.\n" "If no parameters are given, all current alloactions are dumped.\n"
"If either \"team\" or \"thread\" is specified as the first argument,\n" "If either \"team\" or \"thread\" is specified as the first argument,\n"
"only allocations matching the team or thread id given in the second\n" "only allocations matching the team or thread id given in the second\n"
"argument are printed.\n", 0); "argument are printed.\n"
"If the optional argument \"stats\" is specified, only the allocation\n"
"counts and no individual allocations are printed\n", 0);
#endif #endif
return B_OK; return B_OK;
} }