From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756813AbdIHSu2 (ORCPT ); Fri, 8 Sep 2017 14:50:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:46572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756615AbdIHSu1 (ORCPT ); Fri, 8 Sep 2017 14:50:27 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1750E21E9D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=rostedt@goodmis.org Date: Fri, 8 Sep 2017 14:50:23 -0400 From: Steven Rostedt To: Tom Zanussi Cc: tglx@linutronix.de, mhiramat@kernel.org, namhyung@kernel.org, vedang.patel@intel.com, bigeasy@linutronix.de, joel.opensrc@gmail.com, joelaf@google.com, mathieu.desnoyers@efficios.com, baohong.liu@intel.com, linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org Subject: Re: [PATCH v2 31/40] tracing: Allow whitespace to surround hist trigger filter Message-ID: <20170908145023.462c3a79@gandalf.local.home> In-Reply-To: <9e6d9f17bcd71f29dec9039ab00d316ca2965c43.1504642143.git.tom.zanussi@linux.intel.com> References: <9e6d9f17bcd71f29dec9039ab00d316ca2965c43.1504642143.git.tom.zanussi@linux.intel.com> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 5 Sep 2017 16:57:43 -0500 Tom Zanussi 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 > --- > 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); -- Steve > > attrs = parse_hist_trigger_attrs(trigger); > if (IS_ERR(attrs)) > @@ -4889,6 +4899,7 @@ static int event_hist_trigger_func(struct event_command *cmd_ops, > } > > ret = cmd_ops->reg(glob, trigger_ops, trigger_data, file); > + > /* > * The above returns on success the # of triggers registered, > * but if it didn't register any it returns zero. Consider no