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

* Added "address" specifier for the "allocations" KDL command.

Browse Source 
* Removed superfluous malloc.h include.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34093 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-11-17 16:07:58 +00:00
parent 9306738deb
commit 8fd850fca9
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/heap.cpp
+26 -15
View File
@@ -7,6 +7,7 @@
* Distributed under the terms of the NewOS License. * Distributed under the terms of the NewOS License.
*/ */
#include <arch/debug.h> #include <arch/debug.h>
#include <debug.h> #include <debug.h>
#include <elf.h> #include <elf.h>
@@ -14,7 +15,6 @@
#include <int.h> #include <int.h>
#include <kernel.h> #include <kernel.h>
#include <lock.h> #include <lock.h>
#include <malloc.h>
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include <team.h> #include <team.h>
@@ -308,11 +308,15 @@ dump_page(heap_page *page)
static void static void
dump_bin(heap_bin *bin) dump_bin(heap_bin *bin)
{ {
kprintf("\telement_size: %lu; max_free_count: %u; page_list %p;\n", uint32 count = 0;
bin->element_size, bin->max_free_count, bin->page_list); for (heap_page *page = bin->page_list; page != NULL; page = page->next)
count++;
for (heap_page *temp = bin->page_list; temp != NULL; temp = temp->next) kprintf("\telement_size: %lu; max_free_count: %u; page_list %p (%lu pages"
dump_page(temp); ");\n", bin->element_size, bin->max_free_count, bin->page_list, count);
for (heap_page *page = bin->page_list; page != NULL; page = page->next)
dump_page(page);
} }
@@ -498,14 +502,18 @@ dump_allocations(int argc, char **argv)
team_id team = -1; team_id team = -1;
thread_id thread = -1; thread_id thread = -1;
addr_t caller = 0; addr_t caller = 0;
addr_t address = 0;
bool statsOnly = false; bool statsOnly = false;
for (int32 i = 1; i < argc; i++) { for (int32 i = 1; i < argc; i++) {
if (strcmp(argv[i], "team") == 0) if (strcmp(argv[i], "team") == 0)
team = strtoul(argv[++i], NULL, 0); team = parse_expression(argv[++i]);
else if (strcmp(argv[i], "thread") == 0) else if (strcmp(argv[i], "thread") == 0)
thread = strtoul(argv[++i], NULL, 0); thread = parse_expression(argv[++i]);
else if (strcmp(argv[i], "caller") == 0) else if (strcmp(argv[i], "caller") == 0)
caller = strtoul(argv[++i], NULL, 0); caller = parse_expression(argv[++i]);
else if (strcmp(argv[i], "address") == 0)
address = parse_expression(argv[++i]);
else if (strcmp(argv[i], "stats") == 0) else if (strcmp(argv[i], "stats") == 0)
statsOnly = true; statsOnly = true;
else { else {
@@ -554,7 +562,8 @@ dump_allocations(int argc, char **argv)
if ((team == -1 || info->team == team) if ((team == -1 || info->team == team)
&& (thread == -1 || info->thread == thread) && (thread == -1 || info->thread == thread)
&& (caller == 0 || info->caller == caller)) { && (caller == 0 || info->caller == caller)
&& (address == 0 || base == address)) {
// interesting... // interesting...
if (!statsOnly) { if (!statsOnly) {
kprintf("team: % 6ld; thread: % 6ld; " kprintf("team: % 6ld; thread: % 6ld; "
@@ -583,7 +592,8 @@ dump_allocations(int argc, char **argv)
if ((team == -1 || info->team == team) if ((team == -1 || info->team == team)
&& (thread == -1 || info->thread == thread) && (thread == -1 || info->thread == thread)
&& (caller == 0 || info->caller == caller)) { && (caller == 0 || info->caller == caller)
&& (address == 0 || base == address)) {
// interesting... // interesting...
if (!statsOnly) { if (!statsOnly) {
kprintf("team: % 6ld; thread: % 6ld;" kprintf("team: % 6ld; thread: % 6ld;"
@@ -605,7 +615,8 @@ dump_allocations(int argc, char **argv)
} }
} }
kprintf("total allocations: %lu; total bytes: %lu\n", totalCount, totalSize); kprintf("total allocations: %lu; total bytes: %lu\n", totalCount,
totalSize);
return 0; return 0;
} }
@@ -1922,11 +1933,11 @@ heap_init(addr_t base, size_t size)
#else // !KERNEL_HEAP_LEAK_CHECK #else // !KERNEL_HEAP_LEAK_CHECK
add_debugger_command_etc("allocations", &dump_allocations, add_debugger_command_etc("allocations", &dump_allocations,
"Dump current heap allocations", "Dump current heap allocations",
"[(\"team\" | \"thread\") <id>] [ \"caller\" <address> ] [\"stats\"]\n" "[(\"team\" | \"thread\") <id>] [\"caller\" <address>] [\"address\" <address>] [\"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 \"team\", \"thread\", and/or \"caller\" is specified as the first\n" "If \"team\", \"thread\", \"caller\", and/or \"address\" is specified as the first\n"
"argument, only allocations matching the team id, thread id, or \n" "argument, only allocations matching the team ID, thread ID, caller\n"
"caller address given in the second argument are printed.\n" "address or allocated address given in the second argument are printed.\n"
"If the optional argument \"stats\" is specified, only the allocation\n" "If the optional argument \"stats\" is specified, only the allocation\n"
"counts and no individual allocations are printed\n", 0); "counts and no individual allocations are printed\n", 0);
add_debugger_command_etc("allocations_per_caller", add_debugger_command_etc("allocations_per_caller",