Commit 4bd77321 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds

[PATCH] sched: fix show_task()/show_tasks() output

fix show_task()/show_tasks() output:

- there's no sibling info anymore

- the fields were not aligned properly with the description

- get rid of the lazy-TLB output: it's been quite some time since
  we last had a bug there, and when we had a bug it wasnt helped a
  bit by this debug output.
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 45f384a6
...@@ -4647,14 +4647,14 @@ static void show_task(struct task_struct *p) ...@@ -4647,14 +4647,14 @@ static void show_task(struct task_struct *p)
state = p->state ? __ffs(p->state) + 1 : 0; state = p->state ? __ffs(p->state) + 1 : 0;
printk("%-13.13s %c", p->comm, printk("%-13.13s %c", p->comm,
state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?'); state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?');
#if (BITS_PER_LONG == 32) #if BITS_PER_LONG == 32
if (state == TASK_RUNNING) if (state == TASK_RUNNING)
printk(" running "); printk(" running ");
else else
printk(" %08lX ", thread_saved_pc(p)); printk(" %08lx ", thread_saved_pc(p));
#else #else
if (state == TASK_RUNNING) if (state == TASK_RUNNING)
printk(" running task "); printk(" running task ");
else else
printk(" %016lx ", thread_saved_pc(p)); printk(" %016lx ", thread_saved_pc(p));
#endif #endif
...@@ -4666,11 +4666,7 @@ static void show_task(struct task_struct *p) ...@@ -4666,11 +4666,7 @@ static void show_task(struct task_struct *p)
free = (unsigned long)n - (unsigned long)end_of_stack(p); free = (unsigned long)n - (unsigned long)end_of_stack(p);
} }
#endif #endif
printk("%5lu %5d %6d", free, p->pid, p->parent->pid); printk("%5lu %5d %6d\n", free, p->pid, p->parent->pid);
if (!p->mm)
printk(" (L-TLB)\n");
else
printk(" (NOTLB)\n");
if (state != TASK_RUNNING) if (state != TASK_RUNNING)
show_stack(p, NULL); show_stack(p, NULL);
...@@ -4680,14 +4676,12 @@ void show_state_filter(unsigned long state_filter) ...@@ -4680,14 +4676,12 @@ void show_state_filter(unsigned long state_filter)
{ {
struct task_struct *g, *p; struct task_struct *g, *p;
#if (BITS_PER_LONG == 32) #if BITS_PER_LONG == 32
printk("\n" printk(KERN_INFO
" free sibling\n"); " task PC stack pid father\n");
printk(" task PC stack pid father child younger older\n");
#else #else
printk("\n" printk(KERN_INFO
" free sibling\n"); " task PC stack pid father\n");
printk(" task PC stack pid father child younger older\n");
#endif #endif
read_lock(&tasklist_lock); read_lock(&tasklist_lock);
do_each_thread(g, p) { do_each_thread(g, p) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment