[<prev] [next>] [day] [month] [year] [list]
Message-ID: <48E11F1E.4060809@gmail.com>
Date: Mon, 29 Sep 2008 20:31:58 +0200
From: Frederic Weisbecker <fweisbec@...il.com>
To: mingo@...e.hu
CC: pq@....fi, linux-kernel@...r.kernel.org, rostedt@...dmis.org
Subject: [PATCH -tip 4/4] Tracing/ftrace: adapt the boot tracer to the new
print_line type
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@...il.com>
---
kernel/trace/trace_boot.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c
index d5c9e2e..48186b1 100644
--- a/kernel/trace/trace_boot.c
+++ b/kernel/trace/trace_boot.c
@@ -45,21 +45,24 @@ 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 boot_trace *it = &entry->field.initcall;
struct trace_seq *s = &iter->seq;
- if (iter->ent->type == TRACE_BOOT)
+ if (iter->ent->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 =
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists