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

* Added option "-s" to the "thread" command, which prints the info in

Browse Source 
short form (like "threads").
* "thread" allows to specify more than one thread now.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27152 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2008-08-22 14:29:00 +00:00
parent 43a5ec83ef
commit 16cfc87748
1 changed files with 108 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
src/system/kernel/thread.cpp
View File

@ -1032,8 +1032,79 @@ state_to_text(struct thread *thread, int32 state)
static void static void
_dump_thread_info(struct thread *thread) print_thread_list_table_head()
{ {
kprintf("thread id state wait for object cpu pri stack "
" team name\n");
}
static void
_dump_thread_info(struct thread *thread, bool shortInfo)
{
if (shortInfo) {
kprintf("%p %6ld %-10s", thread, thread->id, state_to_text(thread,
thread->state));
// does it block on a semaphore or a condition variable?
if (thread->state == B_THREAD_WAITING) {
switch (thread->wait.type) {
case THREAD_BLOCK_TYPE_SEMAPHORE:
{
sem_id sem = (sem_id)(addr_t)thread->wait.object;
if (sem == thread->msg.read_sem)
kprintf(" ");
else
kprintf("sem %12ld ", sem);
break;
}
case THREAD_BLOCK_TYPE_CONDITION_VARIABLE:
kprintf("cvar %p ", thread->wait.object);
break;
case THREAD_BLOCK_TYPE_SNOOZE:
kprintf(" ");
break;
case THREAD_BLOCK_TYPE_SIGNAL:
kprintf("signal ");
break;
case THREAD_BLOCK_TYPE_MUTEX:
kprintf("mutex %p ", thread->wait.object);
break;
case THREAD_BLOCK_TYPE_RW_LOCK:
kprintf("rwlock %p ", thread->wait.object);
break;
case THREAD_BLOCK_TYPE_OTHER:
kprintf("other ");
break;
default:
kprintf("??? %p ", thread->wait.object);
break;
}
} else
kprintf(" - ");
// on which CPU does it run?
if (thread->cpu)
kprintf("%2d", thread->cpu->cpu_num);
else
kprintf(" -");
kprintf("%4ld %p%5ld %s\n", thread->priority,
(void *)thread->kernel_stack_base, thread->team->id,
thread->name != NULL ? thread->name : "<NULL>");
return;
}
// print the long info
struct death_entry *death = NULL; struct death_entry *death = NULL;
kprintf("THREAD: %p\n", thread); kprintf("THREAD: %p\n", thread);
@ -1129,44 +1200,48 @@ _dump_thread_info(struct thread *thread)
static int static int
dump_thread_info(int argc, char **argv) dump_thread_info(int argc, char **argv)
{ {
const char *name = NULL; bool shortInfo = false;
struct thread *thread; int argi = 1;
int32 id = -1; if (argi < argc && strcmp(argv[argi], "-s") == 0) {
struct hash_iterator i; shortInfo = true;
bool found = false; print_thread_list_table_head();
argi++;
}
if (argc > 2) { if (argi == argc) {
print_debugger_command_usage(argv[0]); _dump_thread_info(thread_get_current_thread(), shortInfo);
return 0; return 0;
} }
if (argc == 1) { for (; argi < argc; argi++) {
_dump_thread_info(thread_get_current_thread()); const char *name = argv[argi];
return 0; int32 id = strtoul(name, NULL, 0);
} else {
name = argv[1];
id = strtoul(argv[1], NULL, 0);
if (IS_KERNEL_ADDRESS(id)) { if (IS_KERNEL_ADDRESS(id)) {
// semi-hack // semi-hack
_dump_thread_info((struct thread *)id); _dump_thread_info((struct thread *)id, shortInfo);
return 0; continue;
} }
// walk through the thread list, trying to match name or id
bool found = false;
struct hash_iterator i;
hash_open(sThreadHash, &i);
struct thread *thread;
while ((thread = (struct thread*)hash_next(sThreadHash, &i)) != NULL) {
if ((name != NULL && !strcmp(name, thread->name))
|| thread->id == id) {
_dump_thread_info(thread, shortInfo);
found = true;
break;
}
}
hash_close(sThreadHash, &i, false);
if (!found)
kprintf("thread \"%s\" (%ld) doesn't exist!\n", name, id);
} }
// walk through the thread list, trying to match name or id
hash_open(sThreadHash, &i);
while ((thread = (struct thread*)hash_next(sThreadHash, &i)) != NULL) {
if ((name != NULL && !strcmp(name, thread->name)) || thread->id == id) {
_dump_thread_info(thread);
found = true;
break;
}
}
hash_close(sThreadHash, &i, false);
if (!found)
kprintf("thread \"%s\" (%ld) doesn't exist!\n", argv[1], id);
return 0; return 0;
} }
@ -1216,8 +1291,7 @@ dump_thread_list(int argc, char **argv)
kprintf("ignoring invalid team argument.\n"); kprintf("ignoring invalid team argument.\n");
} }
kprintf("thread id state wait for object cpu pri stack " print_thread_list_table_head();
" team name\n");
hash_open(sThreadHash, &i); hash_open(sThreadHash, &i);
while ((thread = (struct thread*)hash_next(sThreadHash, &i)) != NULL) { while ((thread = (struct thread*)hash_next(sThreadHash, &i)) != NULL) {
@ -1230,62 +1304,7 @@ dump_thread_list(int argc, char **argv)
|| (realTimeOnly && thread->priority < B_REAL_TIME_DISPLAY_PRIORITY)) || (realTimeOnly && thread->priority < B_REAL_TIME_DISPLAY_PRIORITY))
continue; continue;
kprintf("%p %6ld %-10s", thread, thread->id, state_to_text(thread, _dump_thread_info(thread, true);
thread->state));
// does it block on a semaphore or a condition variable?
if (thread->state == B_THREAD_WAITING) {
switch (thread->wait.type) {
case THREAD_BLOCK_TYPE_SEMAPHORE:
{
sem_id sem = (sem_id)(addr_t)thread->wait.object;
if (sem == thread->msg.read_sem)
kprintf(" ");
else
kprintf("sem %12ld ", sem);
break;
}
case THREAD_BLOCK_TYPE_CONDITION_VARIABLE:
kprintf("cvar %p ", thread->wait.object);
break;
case THREAD_BLOCK_TYPE_SNOOZE:
kprintf(" ");
break;
case THREAD_BLOCK_TYPE_SIGNAL:
kprintf("signal ");
break;
case THREAD_BLOCK_TYPE_MUTEX:
kprintf("mutex %p ", thread->wait.object);
break;
case THREAD_BLOCK_TYPE_RW_LOCK:
kprintf("rwlock %p ", thread->wait.object);
break;
case THREAD_BLOCK_TYPE_OTHER:
kprintf("other ");
break;
default:
kprintf("??? %p ", thread->wait.object);
break;
}
} else
kprintf(" - ");
// on which CPU does it run?
if (thread->cpu)
kprintf("%2d", thread->cpu->cpu_num);
else
kprintf(" -");
kprintf("%4ld %p%5ld %s\n", thread->priority,
(void *)thread->kernel_stack_base, thread->team->id,
thread->name != NULL ? thread->name : "<NULL>");
} }
hash_close(sThreadHash, &i, false); hash_close(sThreadHash, &i, false);
return 0; return 0;
@ -2053,9 +2072,10 @@ thread_init(kernel_args *args)
"Prints a list of all threads with realtime priority.\n", 0); "Prints a list of all threads with realtime priority.\n", 0);
add_debugger_command_etc("thread", &dump_thread_info, add_debugger_command_etc("thread", &dump_thread_info,
"Dump info about a particular thread", "Dump info about a particular thread",
"[ <id> | <address> | <name> ]\n" "[ -s ] ( <id> | <address> | <name> )*\n"
"Prints information about the specified thread. If no argument is\n" "Prints information about the specified thread. If no argument is\n"
"given the current thread is selected.\n" "given the current thread is selected.\n"
" -s - Print info in compact table form (like \"threads\").\n"
" <id> - The ID of the thread.\n" " <id> - The ID of the thread.\n"
" <address> - The address of the thread structure.\n" " <address> - The address of the thread structure.\n"
" <name> - The thread's name.\n", 0); " <name> - The thread's name.\n", 0);