lkml.org 
[lkml]   [2018]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH RT 3/5] tracing: Restore proper field flag printing when displaying triggers
    On Wed, 16 May 2018 17:32:14 +0200
    Sebastian Andrzej Siewior <bigeasy@linutronix.de> wrote:

    > On 2018-05-16 09:36:45 [-0400], Steven Rostedt wrote:
    > > diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
    > > index 9dac8bae4f34..4745ed588607 100644
    > > --- a/kernel/trace/trace_events_hist.c
    > > +++ b/kernel/trace/trace_events_hist.c
    > > @@ -4916,6 +4916,16 @@ static void hist_field_print(struct seq_file *m, struct hist_field *hist_field)
    > > seq_printf(m, "%s", field_name);
    > > } else if (hist_field->flags & HIST_FIELD_FL_TIMESTAMP)
    > > seq_puts(m, "common_timestamp");
    > > +
    > > + if (hist_field->flags) {
    > > + if (!(hist_field->flags & HIST_FIELD_FL_VAR_REF) &&
    > > + !(hist_field->flags & HIST_FIELD_FL_EXPR)) {
    > > + const char *flags = get_hist_field_flags(hist_field);
    > > +
    > > + if (flags)
    > > + seq_printf(m, ".%s", flags);
    > > + }
    > > + }
    > > }
    > >
    > > static int event_hist_trigger_print(struct seq_file *m,
    >
    > For v4.16 I needed commit 0ae7961e75c3 ("tracing: Fix display of hist
    > trigger expressions containing timestamps") in order to get this one

    Yes, I assumed you had it as you pulled it into 4.14-rt. I was just
    looking at what 4.14-rt has. Anything you added there you should add to
    4.16-rt as well.

    > cleanly applied. Comparing with -rc3 it looks like commit 5e4cf2bf6d1c
    > ("tracing: Fix a potential NULL dereference") would be great addition.

    Good catch, yeah, I should pull that in too.

    >
    > Safe to take them, right?

    Yep.

    -- Steve

    \
     
     \ /
      Last update: 2018-05-16 17:46    [W:7.843 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site