ftrace: include cpu in stacktrace

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Ingo Molnar
2008-05-12 21:20:53 +02:00
committed by Thomas Gleixner
parent 442e544ce5
commit f29c73fe34

View File

@@ -1227,10 +1227,8 @@ print_lat_fmt(struct trace_iterator *iter, unsigned int trace_idx, int cpu)
abs_usecs % 1000, rel_usecs/1000, abs_usecs % 1000, rel_usecs/1000,
rel_usecs % 1000); rel_usecs % 1000);
} else { } else {
if (entry->type != TRACE_STACK) { lat_print_generic(s, entry, cpu);
lat_print_generic(s, entry, cpu); lat_print_timestamp(s, abs_usecs, rel_usecs);
lat_print_timestamp(s, abs_usecs, rel_usecs);
}
} }
switch (entry->type) { switch (entry->type) {
case TRACE_FN: case TRACE_FN:
@@ -1293,17 +1291,15 @@ static int print_trace_fmt(struct trace_iterator *iter)
usec_rem = do_div(t, 1000000ULL); usec_rem = do_div(t, 1000000ULL);
secs = (unsigned long)t; secs = (unsigned long)t;
if (entry->type != TRACE_STACK) { ret = trace_seq_printf(s, "%16s-%-5d ", comm, entry->pid);
ret = trace_seq_printf(s, "%16s-%-5d ", comm, entry->pid); if (!ret)
if (!ret) return 0;
return 0; ret = trace_seq_printf(s, "[%02d] ", iter->cpu);
ret = trace_seq_printf(s, "[%02d] ", iter->cpu); if (!ret)
if (!ret) return 0;
return 0; ret = trace_seq_printf(s, "%5lu.%06lu: ", secs, usec_rem);
ret = trace_seq_printf(s, "%5lu.%06lu: ", secs, usec_rem); if (!ret)
if (!ret) return 0;
return 0;
}
switch (entry->type) { switch (entry->type) {
case TRACE_FN: case TRACE_FN: