From: Tom Zanussi <zanussi@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kernel@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Joe Perches <joe@perches.com>, Namhyung Kim <namhyung@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>,
linux-sh@vger.kernel.org
Subject: Re: [for-next][PATCH 2/5] tracing: Use str_has_prefix() helper for histogram code
Date: Sat, 22 Dec 2018 12:03:41 -0600 [thread overview]
Message-ID: <1545501821.4383.2.camel@kernel.org> (raw)
In-Reply-To: <20181222130107.43aaac9c@gandalf.local.home>
Hi Steve,
On Sat, 2018-12-22 at 13:01 -0500, Steven Rostedt wrote:
> On Sat, 22 Dec 2018 11:20:09 -0500
> Steven Rostedt <rostedt@goodmis.org> wrote:
>
> > From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
> >
> > The tracing histogram code contains a lot of instances of the
> > construct:
> >
> > strncmp(str, "const", sizeof("const") - 1)
> >
> > This can be prone to bugs due to typos or bad cut and paste. Use
> > the
> > str_has_prefix() helper macro instead that removes the need for
> > having two
> > copies of the constant string.
> >
> > Cc: Tom Zanussi <zanussi@linux.intel.com>
>
> I have no idea why I copied your intel email. The linux.intel.com
> appears to be no longer active. I'm going to rebase to fix this email
> address.
linux.intel.com is active, but there's no zanussi there, just
tom.zanussi ;-)
So tom.zanussi@linux.intel.com should work fine.
Tom
>
> -- Steve
>
>
> > Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> > ---
> > kernel/trace/trace_events_hist.c | 28 ++++++++++++++--------------
> > 1 file changed, 14 insertions(+), 14 deletions(-)
> >
> > diff --git a/kernel/trace/trace_events_hist.c
> > b/kernel/trace/trace_events_hist.c
> > index c5448c103770..9d590138f870 100644
> > --- a/kernel/trace/trace_events_hist.c
> > +++ b/kernel/trace/trace_events_hist.c
> > @@ -1881,8 +1881,8 @@ static int parse_action(char *str, struct
> > hist_trigger_attrs *attrs)
> > if (attrs->n_actions >= HIST_ACTIONS_MAX)
> > return ret;
> >
> > - if ((strncmp(str, "onmatch(", sizeof("onmatch(") - 1) ==
> > 0) ||
> > - (strncmp(str, "onmax(", sizeof("onmax(") - 1) == 0)) {
> > + if ((str_has_prefix(str, "onmatch(")) ||
> > + (str_has_prefix(str, "onmax("))) {
> > attrs->action_str[attrs->n_actions] = kstrdup(str,
> > GFP_KERNEL);
> > if (!attrs->action_str[attrs->n_actions]) {
> > ret = -ENOMEM;
> > @@ -1899,34 +1899,34 @@ static int parse_assignment(char *str,
> > struct hist_trigger_attrs *attrs)
> > {
> > int ret = 0;
> >
> > - if ((strncmp(str, "key=", sizeof("key=") - 1) == 0) ||
> > - (strncmp(str, "keys=", sizeof("keys=") - 1) == 0)) {
> > + if ((str_has_prefix(str, "key=")) ||
> > + (str_has_prefix(str, "keys="))) {
> > attrs->keys_str = kstrdup(str, GFP_KERNEL);
> > if (!attrs->keys_str) {
> > ret = -ENOMEM;
> > goto out;
> > }
> > - } else if ((strncmp(str, "val=", sizeof("val=") - 1) == 0)
> > ||
> > - (strncmp(str, "vals=", sizeof("vals=") - 1) == 0)
> > ||
> > - (strncmp(str, "values=", sizeof("values=") - 1)
> > == 0)) {
> > + } else if ((str_has_prefix(str, "val=")) ||
> > + (str_has_prefix(str, "vals=")) ||
> > + (str_has_prefix(str, "values="))) {
> > attrs->vals_str = kstrdup(str, GFP_KERNEL);
> > if (!attrs->vals_str) {
> > ret = -ENOMEM;
> > goto out;
> > }
> > - } else if (strncmp(str, "sort=", sizeof("sort=") - 1) ==
> > 0) {
> > + } else if (str_has_prefix(str, "sort=")) {
> > attrs->sort_key_str = kstrdup(str, GFP_KERNEL);
> > if (!attrs->sort_key_str) {
> > ret = -ENOMEM;
> > goto out;
> > }
> > - } else if (strncmp(str, "name=", sizeof("name=") - 1) ==
> > 0) {
> > + } else if (str_has_prefix(str, "name=")) {
> > attrs->name = kstrdup(str, GFP_KERNEL);
> > if (!attrs->name) {
> > ret = -ENOMEM;
> > goto out;
> > }
> > - } else if (strncmp(str, "clock=", sizeof("clock=") - 1) ==
> > 0) {
> > + } else if (str_has_prefix(str, "clock=")) {
> > strsep(&str, "=");
> > if (!str) {
> > ret = -EINVAL;
> > @@ -1939,7 +1939,7 @@ static int parse_assignment(char *str, struct
> > hist_trigger_attrs *attrs)
> > ret = -ENOMEM;
> > goto out;
> > }
> > - } else if (strncmp(str, "size=", sizeof("size=") - 1) ==
> > 0) {
> > + } else if (str_has_prefix(str, "size=")) {
> > int map_bits = parse_map_size(str);
> >
> > if (map_bits < 0) {
> > @@ -3558,7 +3558,7 @@ static struct action_data *onmax_parse(char
> > *str)
> > if (!onmax_fn_name || !str)
> > goto free;
> >
> > - if (strncmp(onmax_fn_name, "save", sizeof("save") - 1) ==
> > 0) {
> > + if (str_has_prefix(onmax_fn_name, "save")) {
> > char *params = strsep(&str, ")");
> >
> > if (!params) {
> > @@ -4346,7 +4346,7 @@ static int parse_actions(struct
> > hist_trigger_data *hist_data)
> > for (i = 0; i < hist_data->attrs->n_actions; i++) {
> > str = hist_data->attrs->action_str[i];
> >
> > - if (strncmp(str, "onmatch(", sizeof("onmatch(") -
> > 1) == 0) {
> > + if (str_has_prefix(str, "onmatch(")) {
> > char *action_str = str +
> > sizeof("onmatch(") - 1;
> >
> > data = onmatch_parse(tr, action_str);
> > @@ -4355,7 +4355,7 @@ static int parse_actions(struct
> > hist_trigger_data *hist_data)
> > break;
> > }
> > data->fn = action_trace;
> > - } else if (strncmp(str, "onmax(", sizeof("onmax(")
> > - 1) == 0) {
> > + } else if (str_has_prefix(str, "onmax(")) {
> > char *action_str = str + sizeof("onmax(")
> > - 1;
> >
> > data = onmax_parse(action_str);
>
>
next prev parent reply other threads:[~2018-12-22 18:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-22 16:20 [for-next][PATCH 0/5] tracing: Add string_has_prefix() and usages Steven Rostedt
2018-12-22 16:20 ` [for-next][PATCH 1/5] string.h: Add str_has_prefix() helper function Steven Rostedt
2018-12-22 16:20 ` [for-next][PATCH 2/5] tracing: Use str_has_prefix() helper for histogram code Steven Rostedt
2018-12-22 18:01 ` Steven Rostedt
2018-12-22 18:02 ` Steven Rostedt
2018-12-22 18:03 ` Tom Zanussi [this message]
2018-12-23 3:53 ` Steven Rostedt
2018-12-23 16:38 ` Tom Zanussi
2018-12-23 3:32 ` Namhyung Kim
2018-12-22 16:20 ` [for-next][PATCH 3/5] tracing: Use str_has_prefix() instead of using fixed sizes Steven Rostedt
2018-12-22 16:20 ` [for-next][PATCH 4/5] tracing: Have the historgram use the result of str_has_prefix() for len of prefix Steven Rostedt
2018-12-23 3:35 ` Namhyung Kim
2018-12-23 16:40 ` Tom Zanussi
2018-12-22 16:20 ` [for-next][PATCH 5/5] tracing: Use the return of str_has_prefix() to remove open coded numbers Steven Rostedt
2018-12-23 3:23 ` Masami Hiramatsu
2018-12-23 3:46 ` Steven Rostedt
2018-12-23 0:55 ` [for-next][PATCH 0/5] tracing: Add string_has_prefix() and usages Steven Rostedt
2018-12-23 3:41 ` Namhyung Kim
2018-12-23 3:53 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1545501821.4383.2.camel@kernel.org \
--to=zanussi@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=dalias@libc.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.org \
--cc=torvalds@linux-foundation.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).