summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_mmiotrace.c
diff options
context:
space:
mode:
authorPekka Paalanen <pq@iki.fi>2008-09-16 22:02:27 +0300
committerIngo Molnar <mingo@elte.hu>2008-10-14 10:37:14 +0200
commitfc5e27ae4b45a0619701a83f30d9b7fad7ed9400 (patch)
tree236b53e76430aae9f6b1abc37de9259ba95c38c6 /kernel/trace/trace_mmiotrace.c
parent9e57fb35d711331a9b1410c5c56ebeb3733428a0 (diff)
downloadlinux-stable-fc5e27ae4b45a0619701a83f30d9b7fad7ed9400.tar.gz
linux-stable-fc5e27ae4b45a0619701a83f30d9b7fad7ed9400.tar.bz2
linux-stable-fc5e27ae4b45a0619701a83f30d9b7fad7ed9400.zip
mmiotrace: handle TRACE_PRINT entries
Also make trace_seq_print_cont() non-static, and add a newline if the seq buffer can't hold all data. Signed-off-by: Pekka Paalanen <pq@iki.fi> Acked-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_mmiotrace.c')
-rw-r--r--kernel/trace/trace_mmiotrace.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
index 767d1faf56e5..a108c326f36e 100644
--- a/kernel/trace/trace_mmiotrace.c
+++ b/kernel/trace/trace_mmiotrace.c
@@ -245,6 +245,27 @@ static int mmio_print_map(struct trace_iterator *iter)
return 0;
}
+static int mmio_print_mark(struct trace_iterator *iter)
+{
+ struct trace_entry *entry = iter->ent;
+ const char *msg = entry->field.print.buf;
+ struct trace_seq *s = &iter->seq;
+ unsigned long long t = ns2usecs(entry->field.t);
+ unsigned long usec_rem = do_div(t, 1000000ULL);
+ unsigned secs = (unsigned long)t;
+ int ret;
+
+ /* The trailing newline must be in the message. */
+ ret = trace_seq_printf(s, "MARK %lu.%06lu %s", secs, usec_rem, msg);
+ if (!ret)
+ return 0;
+
+ if (entry->field.flags & TRACE_FLAG_CONT)
+ trace_seq_print_cont(s, iter);
+
+ return 1;
+}
+
/* return 0 to abort printing without consuming current entry in pipe mode */
static int mmio_print_line(struct trace_iterator *iter)
{
@@ -253,6 +274,8 @@ static int mmio_print_line(struct trace_iterator *iter)
return mmio_print_rw(iter);
case TRACE_MMIO_MAP:
return mmio_print_map(iter);
+ case TRACE_PRINT:
+ return mmio_print_mark(iter);
default:
return 1; /* ignore unknown entries */
}