Skip to content

Commit

Permalink
tracing/ftrace: adapt the boot tracer to the new print_line type
Browse files Browse the repository at this point in the history
This patch adapts the boot tracer to the new type of the
print_line callback.

It still relays entries it doesn't support to default output
functions.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Pekka Paalanen <pq@iki.fi>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Frederic Weisbecker authored and Ingo Molnar committed Oct 14, 2008
1 parent 07f4e4f commit 9e9efff
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions kernel/trace/trace_boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,25 @@ static void boot_trace_ctrl_update(struct trace_array *tr)
stop_boot_trace(tr);
}

static int initcall_print_line(struct trace_iterator *iter)
static enum print_line_t initcall_print_line(struct trace_iterator *iter)
{
int ret = 0;
int ret;
struct trace_entry *entry = iter->ent;
struct trace_boot *field = (struct trace_boot *)entry;
struct boot_trace *it = &field->initcall;
struct trace_seq *s = &iter->seq;

if (entry->type == TRACE_BOOT)
if (entry->type == TRACE_BOOT) {
ret = trace_seq_printf(s, "%pF called from %i "
"returned %d after %lld msecs\n",
it->func, it->caller, it->result,
it->duration);
if (ret)
return 1;
return 0;
if (ret)
return TRACE_TYPE_HANDLED;
else
return TRACE_TYPE_PARTIAL_LINE;
}
return TRACE_TYPE_UNHANDLED;
}

struct tracer boot_tracer __read_mostly =
Expand Down

0 comments on commit 9e9efff

Please sign in to comment.