On Fri, 2017-09-08 at 14:50 -0400, Steven Rostedt wrote:
> On Tue, 5 Sep 2017 16:57:43 -0500
> Tom Zanussi <tom.zanussi@xxxxxxxxxxxxxxx> wrote:
>
> > The existing code only allows for one space before and after the 'if'
> > specifying the filter for a hist trigger. Add code to make that more
> > permissive as far as whitespace goes.
> >
> > Signed-off-by: Tom Zanussi <tom.zanussi@xxxxxxxxxxxxxxx>
> > ---
> > kernel/trace/trace_events_hist.c | 19 +++++++++++++++----
> > 1 file changed, 15 insertions(+), 4 deletions(-)
> >
> > diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
> > index 0a398f3..4f66f2e 100644
> > --- a/kernel/trace/trace_events_hist.c
> > +++ b/kernel/trace/trace_events_hist.c
> > @@ -4819,7 +4819,7 @@ static int event_hist_trigger_func(struct event_command *cmd_ops,
> > struct synth_event *se;
> > const char *se_name;
> > bool remove = false;
> > - char *trigger;
> > + char *trigger, *p;
> > int ret = 0;
> >
> > if (!param)
> > @@ -4829,9 +4829,19 @@ static int event_hist_trigger_func(struct event_command *cmd_ops,
> > remove = true;
> >
> > /* separate the trigger from the filter (k:v [if filter]) */
> > - trigger = strsep(¶m, " \t");
> > - if (!trigger)
> > - return -EINVAL;
> > + trigger = param;
> > + p = strstr(param, " if");
> > + if (!p)
> > + p = strstr(param, "\tif");
> > + if (p) {
> > + if (p == trigger)
> > + return -EINVAL;
> > + param = p + 1;
> > + param = strstrip(param);
> > + *p = '\0';
> > + trigger = strstrip(trigger);
> > + } else
> > + param = NULL;
>
> This seems rather complex. Wouldn't the following work?
>
> param = skip_spaces(param);
> trigger = strsep(¶m, " \t");
> if (param)
> param = strstrip(param);
>
Yes, much better ;-)
Tom
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
