From mboxrd@z Thu Jan 1 00:00:00 1970 From: Namhyung Kim Date: Sun, 23 Dec 2018 03:35:56 +0000 Subject: Re: [for-next][PATCH 4/5] tracing: Have the historgram use the result of str_has_prefix() for len of Message-Id: <20181223033556.GE11421@danjae.aot.lge.com> List-Id: References: <20181222162007.697862256@goodmis.org> <20181222162856.972056232@goodmis.org> In-Reply-To: <20181222162856.972056232@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Steven Rostedt Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Andrew Morton , Joe Perches , Linus Torvalds , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org, Tom Zanussi , kernel-team@lge.com On Sat, Dec 22, 2018 at 11:20:11AM -0500, Steven Rostedt wrote: > From: "Steven Rostedt (VMware)" > > 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 > Signed-off-by: Steven Rostedt (VMware) > --- > kernel/trace/trace_events_hist.c | 9 +++++---- > 1 file 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; Ah you did it here. Thanks, Namhyung > > 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)) { > -- > 2.19.2 > >