[PATCH v2 31/40] tracing: Allow whitespace to surround hist trigger filter

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Tom Zanussi <tom.zanussi@linux.intel.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 31/40] tracing: Allow whitespace to surround hist trigger filter
Date	Wed, 06 Sep 2017 00:10:01 +0200
Message-ID	<umucF-oz-3@gated-at.bofh.it> (permalink)
References	<umu2Z-5m-5@gated-at.bofh.it>
X-Extloop1	1
X-Ironport-Av	E=Sophos;i="5.41,481,1498546800"; d="scan'208";a="1011287689"
X-Mailer	git-send-email 1.9.3
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	55
Organization	linux.* mail to news gateway
X-Original-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, Tom Zanussi <tom.zanussi@linux.intel.com>
X-Original-Date	Tue, 5 Sep 2017 16:57:43 -0500
X-Original-Message-ID	<9e6d9f17bcd71f29dec9039ab00d316ca2965c43.1504642143.git.tom.zanussi@linux.intel.com>
X-Original-References	<cover.1504642143.git.tom.zanussi@linux.intel.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1727022

Show key headers only | View raw

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@linux.intel.com>
---
 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(&param, " \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;
 
 	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
-- 
1.9.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 31/40] tracing: Allow whitespace to surround hist trigger filter Tom Zanussi <tom.zanussi@linux.intel.com> - 2017-09-06 00:10 +0200
  Re: [PATCH v2 31/40] tracing: Allow whitespace to surround hist  trigger filter Steven Rostedt <rostedt@goodmis.org> - 2017-09-08 21:00 +0200
    Re: [PATCH v2 31/40] tracing: Allow whitespace to surround hist  trigger filter Tom Zanussi <tom.zanussi@linux.intel.com> - 2017-09-08 21:10 +0200

csiph-web