Messages in this thread | | | Date | Mon, 29 Sep 2008 22:19:34 +0300 | From | Pekka Paalanen <> | Subject | Re: [PATCH V2 -tip 3/4] Tracing/ftrace: Adapt mmiotrace to the new type of print_line |
| |
On Mon, 29 Sep 2008 20:27:42 +0200 Frederic Weisbecker <fweisbec@gmail.com> wrote:
> Adapt mmiotrace to the new print_line type. > By default, it ignores (and consumes) types it doesn't support. > > Acked-by: Pekka Paalanen <pq@iki.fi> > Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Ack! All four patches looking good.
Cheers.
> --- > kernel/trace/trace_mmiotrace.c | 25 ++++++++++++------------- > 1 files changed, 12 insertions(+), 13 deletions(-) > > diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c > index a108c32..be0a6b0 100644 > --- a/kernel/trace/trace_mmiotrace.c > +++ b/kernel/trace/trace_mmiotrace.c > @@ -171,7 +171,7 @@ print_out: > return (ret == -EBUSY) ? 0 : ret; > } > > -static int mmio_print_rw(struct trace_iterator *iter) > +static enum print_line_t mmio_print_rw(struct trace_iterator *iter) > { > struct trace_entry *entry = iter->ent; > struct mmiotrace_rw *rw = &entry->field.mmiorw; > @@ -209,11 +209,11 @@ static int mmio_print_rw(struct trace_iterator *iter) > break; > } > if (ret) > - return 1; > - return 0; > + return TRACE_TYPE_HANDLED; > + return TRACE_TYPE_PARTIAL_LINE; > } > > -static int mmio_print_map(struct trace_iterator *iter) > +static enum print_line_t mmio_print_map(struct trace_iterator *iter) > { > struct trace_entry *entry = iter->ent; > struct mmiotrace_map *m = &entry->field.mmiomap; > @@ -221,7 +221,7 @@ static int mmio_print_map(struct trace_iterator *iter) > unsigned long long t = ns2usecs(entry->field.t); > unsigned long usec_rem = do_div(t, 1000000ULL); > unsigned secs = (unsigned long)t; > - int ret = 1; > + int ret; > > switch (entry->field.mmiorw.opcode) { > case MMIO_PROBE: > @@ -241,11 +241,11 @@ static int mmio_print_map(struct trace_iterator *iter) > break; > } > if (ret) > - return 1; > - return 0; > + return TRACE_TYPE_HANDLED; > + return TRACE_TYPE_PARTIAL_LINE; > } > > -static int mmio_print_mark(struct trace_iterator *iter) > +static enum print_line_t mmio_print_mark(struct trace_iterator *iter) > { > struct trace_entry *entry = iter->ent; > const char *msg = entry->field.print.buf; > @@ -258,16 +258,15 @@ static int mmio_print_mark(struct trace_iterator *iter) > /* 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; > + return TRACE_TYPE_PARTIAL_LINE; > > if (entry->field.flags & TRACE_FLAG_CONT) > trace_seq_print_cont(s, iter); > > - return 1; > + return TRACE_TYPE_HANDLED; > } > > -/* return 0 to abort printing without consuming current entry in pipe mode */ > -static int mmio_print_line(struct trace_iterator *iter) > +static enum print_line_t mmio_print_line(struct trace_iterator *iter) > { > switch (iter->ent->type) { > case TRACE_MMIO_RW: > @@ -277,7 +276,7 @@ static int mmio_print_line(struct trace_iterator *iter) > case TRACE_PRINT: > return mmio_print_mark(iter); > default: > - return 1; /* ignore unknown entries */ > + return TRACE_TYPE_HANDLED; /* ignore unknown entries */ > } > } > >
-- Pekka Paalanen http://www.iki.fi/pq/
| |