Skip to content

Commit

Permalink
[PATCH] x86: shorten lines in unwinder to be <= 80 characters
Browse files Browse the repository at this point in the history 
Andrew complained about > 80 character lines in the new unwinder.
Fix that.

Signed-off-by: Andi Kleen <ak@suse.de>
  • Loading branch information
Andi Kleen authored and Andi Kleen committed Dec 7, 2006
1 parent 9b48341 commit b615ebd
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 14 deletions.
16 changes: 10 additions & 6 deletions arch/i386/kernel/traps.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ dump_trace_unwind(struct unwind_frame_info *info, void *data)
return n;
}

#define MSG(msg) ops->warning(data, msg)

void dump_trace(struct task_struct *task, struct pt_regs *regs,
unsigned long *stack,
struct stacktrace_ops *ops, void *data)
Expand All @@ -191,29 +193,31 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
if (unwind_init_frame_info(&info, task, regs) == 0)
unw_ret = dump_trace_unwind(&info, &oad);
} else if (task == current)
unw_ret = unwind_init_running(&info, dump_trace_unwind, &oad);
unw_ret = unwind_init_running(&info, dump_trace_unwind,
&oad);
else {
if (unwind_init_blocked(&info, task) == 0)
unw_ret = dump_trace_unwind(&info, &oad);
}
if (unw_ret > 0) {
if (call_trace == 1 && !arch_unw_user_mode(&info)) {
ops->warning_symbol(data, "DWARF2 unwinder stuck at %s\n",
ops->warning_symbol(data,
"DWARF2 unwinder stuck at %s\n",
UNW_PC(&info));
if (UNW_SP(&info) >= PAGE_OFFSET) {
ops->warning(data, "Leftover inexact backtrace:\n");
MSG("Leftover inexact backtrace:\n");
stack = (void *)UNW_SP(&info);
if (!stack)
return;
ebp = UNW_FP(&info);
} else
ops->warning(data, "Full inexact backtrace again:\n");
MSG("Full inexact backtrace again:\n");
} else if (call_trace >= 1)
return;
else
ops->warning(data, "Full inexact backtrace again:\n");
MSG("Full inexact backtrace again:\n");
} else
ops->warning(data, "Inexact backtrace:\n");
MSG("Inexact backtrace:\n");
}
if (!stack) {
unsigned long dummy;
Expand Down
21 changes: 13 additions & 8 deletions arch/x86_64/kernel/traps.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ static int dump_trace_unwind(struct unwind_frame_info *info, void *context)
return n;
}

#define MSG(txt) ops->warning(data, txt)

/*
* x86-64 can have upto three kernel stacks:
* process stack
Expand All @@ -248,11 +250,12 @@ static inline int valid_stack_ptr(struct thread_info *tinfo, void *p)
return p > t && p < t + THREAD_SIZE - 3;
}

void dump_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long * stack,
void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
unsigned long *stack,
struct stacktrace_ops *ops, void *data)
{
const unsigned cpu = smp_processor_id();
unsigned long *irqstack_end = (unsigned long *)cpu_pda(cpu)->irqstackptr;
unsigned long *irqstack_end = (unsigned long*)cpu_pda(cpu)->irqstackptr;
unsigned used = 0;
struct thread_info *tinfo;

Expand All @@ -268,28 +271,30 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long * s
if (unwind_init_frame_info(&info, tsk, regs) == 0)
unw_ret = dump_trace_unwind(&info, &oad);
} else if (tsk == current)
unw_ret = unwind_init_running(&info, dump_trace_unwind, &oad);
unw_ret = unwind_init_running(&info, dump_trace_unwind,
&oad);
else {
if (unwind_init_blocked(&info, tsk) == 0)
unw_ret = dump_trace_unwind(&info, &oad);
}
if (unw_ret > 0) {
if (call_trace == 1 && !arch_unw_user_mode(&info)) {
ops->warning_symbol(data, "DWARF2 unwinder stuck at %s\n",
ops->warning_symbol(data,
"DWARF2 unwinder stuck at %s\n",
UNW_PC(&info));
if ((long)UNW_SP(&info) < 0) {
ops->warning(data, "Leftover inexact backtrace:\n");
MSG("Leftover inexact backtrace:");
stack = (unsigned long *)UNW_SP(&info);
if (!stack)
return;
} else
ops->warning(data, "Full inexact backtrace again:\n");
MSG("Full inexact backtrace again:\n");
} else if (call_trace >= 1)
return;
else
ops->warning(data, "Full inexact backtrace again:\n");
MSG("Full inexact backtrace again:\n");
} else
ops->warning(data, "Inexact backtrace:\n");
MSG("Inexact backtrace:\n");
}
if (!stack) {
unsigned long dummy;
Expand Down

0 comments on commit b615ebd

Please sign in to comment.