summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2018-12-21 18:40:46 -0500
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2018-12-22 22:52:09 -0500
commit036876fa56204ae0fa59045bd6bbb2691a060633 (patch)
treefd0b860445d7aff7d0ed6a601a78b7ec2e6699c1
parentb6b2735514bcd70ad1556a33892a636b20ece671 (diff)
downloadlinux-036876fa56204ae0fa59045bd6bbb2691a060633.tar.gz
linux-036876fa56204ae0fa59045bd6bbb2691a060633.tar.bz2
linux-036876fa56204ae0fa59045bd6bbb2691a060633.zip
tracing: Have the historgram use the result of str_has_prefix() for len of prefix
As str_has_prefix() returns the length on match, we can use that for the updating of the string pointer instead of recalculating the prefix size. Cc: Tom Zanussi <zanussi@kernel.org> Acked-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--kernel/trace/trace_events_hist.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 0d878dcd1e4b..449d90cfa151 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -4342,12 +4342,13 @@ static int parse_actions(struct hist_trigger_data *hist_data)
unsigned int i;
int ret = 0;
char *str;
+ int len;
for (i = 0; i < hist_data->attrs->n_actions; i++) {
str = hist_data->attrs->action_str[i];
- if (str_has_prefix(str, "onmatch(")) {
- char *action_str = str + sizeof("onmatch(") - 1;
+ if ((len = str_has_prefix(str, "onmatch("))) {
+ char *action_str = str + len;
data = onmatch_parse(tr, action_str);
if (IS_ERR(data)) {
@@ -4355,8 +4356,8 @@ static int parse_actions(struct hist_trigger_data *hist_data)
break;
}
data->fn = action_trace;
- } else if (str_has_prefix(str, "onmax(")) {
- char *action_str = str + sizeof("onmax(") - 1;
+ } else if ((len = str_has_prefix(str, "onmax("))) {
+ char *action_str = str + len;
data = onmax_parse(action_str);
if (IS_ERR(data)) {