linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/4] perf: Fine-tuning for three function implementations
@ 2017-01-23 15:20 SF Markus Elfring
  2017-01-23 15:22 ` [PATCH 1/4] perf probe: Delete an unnecessary check in try_to_find_absolute_address() SF Markus Elfring
                   ` (3 more replies)
  0 siblings, 4 replies; 11+ messages in thread
From: SF Markus Elfring @ 2017-01-23 15:20 UTC (permalink / raw)
  To: Adrian Hunter, Alexander Shishkin, Arnaldo Carvalho de Melo,
	He Kuang, Ingo Molnar, Jiri Olsa, Masami Hiramatsu, Milian Wolff,
	Peter Zijlstra, Ravi Bangoria, Wang Nan
  Cc: LKML, kernel-janitors

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 23 Jan 2017 16:08:21 +0100

A few update suggestions were taken into account
from static source code analysis.

Markus Elfring (4):
  Delete an unnecessary check in try_to_find_absolute_address()
  Delete an unnecessary assignment in try_to_find_absolute_address()
  Move an error code assignment in __perf_session__set_tracepoints_handlers()
  Move an error code assignment in strlist__parse_list_entry()

 tools/perf/util/probe-event.c | 11 ++++-------
 tools/perf/util/session.c     |  6 +++---
 tools/perf/util/strlist.c     |  5 +++--
 3 files changed, 10 insertions(+), 12 deletions(-)

-- 
2.11.0

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 1/4] perf probe: Delete an unnecessary check in try_to_find_absolute_address()
  2017-01-23 15:20 [PATCH 0/4] perf: Fine-tuning for three function implementations SF Markus Elfring
@ 2017-01-23 15:22 ` SF Markus Elfring
  2017-01-23 22:48   ` Masami Hiramatsu
  2017-01-26 15:28   ` [tip:perf/core] " tip-bot for Markus Elfring
  2017-01-23 15:24 ` [PATCH 2/4] perf probe: Delete an unnecessary assignment " SF Markus Elfring
                   ` (2 subsequent siblings)
  3 siblings, 2 replies; 11+ messages in thread
From: SF Markus Elfring @ 2017-01-23 15:22 UTC (permalink / raw)
  To: Adrian Hunter, Alexander Shishkin, Arnaldo Carvalho de Melo,
	He Kuang, Ingo Molnar, Jiri Olsa, Masami Hiramatsu, Milian Wolff,
	Peter Zijlstra, Ravi Bangoria, Wang Nan
  Cc: LKML, kernel-janitors

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 23 Jan 2017 14:54:26 +0100

Remove a condition check which is unnecessary at the end
because this source code place should usually only be reached
with a non-zero pointer.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 tools/perf/util/probe-event.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index d281ae2b54e8..6c7508337fe8 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -2966,10 +2966,8 @@ static int try_to_find_absolute_address(struct perf_probe_event *pev,
 	return 1;
 
 errout:
-	if (*tevs) {
-		clear_probe_trace_events(*tevs, 1);
-		*tevs = NULL;
-	}
+	clear_probe_trace_events(*tevs, 1);
+	*tevs = NULL;
 	return err;
 }
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 2/4] perf probe: Delete an unnecessary assignment in try_to_find_absolute_address()
  2017-01-23 15:20 [PATCH 0/4] perf: Fine-tuning for three function implementations SF Markus Elfring
  2017-01-23 15:22 ` [PATCH 1/4] perf probe: Delete an unnecessary check in try_to_find_absolute_address() SF Markus Elfring
@ 2017-01-23 15:24 ` SF Markus Elfring
  2017-01-23 22:47   ` Masami Hiramatsu
  2017-01-26 15:29   ` [tip:perf/core] " tip-bot for Markus Elfring
  2017-01-23 15:25 ` [PATCH 3/4] perf session: Move an error code assignment in __perf_session__set_tracepoints_handlers() SF Markus Elfring
  2017-01-23 15:26 ` [PATCH 4/4] perf strlist: Move an error code assignment in strlist__parse_list_entry() SF Markus Elfring
  3 siblings, 2 replies; 11+ messages in thread
From: SF Markus Elfring @ 2017-01-23 15:24 UTC (permalink / raw)
  To: Adrian Hunter, Alexander Shishkin, Arnaldo Carvalho de Melo,
	He Kuang, Ingo Molnar, Jiri Olsa, Masami Hiramatsu, Milian Wolff,
	Peter Zijlstra, Ravi Bangoria, Wang Nan
  Cc: LKML, kernel-janitors

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 23 Jan 2017 15:10:19 +0100

Remove an error code assignment which is redundant in an if branch for
the handling of a memory allocation failure because the same value was set
for the local variable "err" before.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 tools/perf/util/probe-event.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 6c7508337fe8..5a34c93b818a 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -2956,10 +2956,9 @@ static int try_to_find_absolute_address(struct perf_probe_event *pev,
 
 	tev->nargs = pev->nargs;
 	tev->args = zalloc(sizeof(struct probe_trace_arg) * tev->nargs);
-	if (!tev->args) {
-		err = -ENOMEM;
+	if (!tev->args)
 		goto errout;
-	}
+
 	for (i = 0; i < tev->nargs; i++)
 		copy_to_probe_trace_arg(&tev->args[i], &pev->args[i]);
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 3/4] perf session: Move an error code assignment in __perf_session__set_tracepoints_handlers()
  2017-01-23 15:20 [PATCH 0/4] perf: Fine-tuning for three function implementations SF Markus Elfring
  2017-01-23 15:22 ` [PATCH 1/4] perf probe: Delete an unnecessary check in try_to_find_absolute_address() SF Markus Elfring
  2017-01-23 15:24 ` [PATCH 2/4] perf probe: Delete an unnecessary assignment " SF Markus Elfring
@ 2017-01-23 15:25 ` SF Markus Elfring
  2017-01-23 22:56   ` Masami Hiramatsu
  2017-01-23 15:26 ` [PATCH 4/4] perf strlist: Move an error code assignment in strlist__parse_list_entry() SF Markus Elfring
  3 siblings, 1 reply; 11+ messages in thread
From: SF Markus Elfring @ 2017-01-23 15:25 UTC (permalink / raw)
  To: Adrian Hunter, Alexander Shishkin, Arnaldo Carvalho de Melo,
	He Kuang, Ingo Molnar, Jiri Olsa, Masami Hiramatsu, Milian Wolff,
	Peter Zijlstra, Ravi Bangoria, Wang Nan
  Cc: LKML, kernel-janitors

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 23 Jan 2017 15:43:13 +0100

A local variable was set to an error code before a concrete error situation
was detected. Thus move the corresponding assignment into an if branch
to indicate a software failure there.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 tools/perf/util/session.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index f268201048a0..98605ad4affd 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -2050,10 +2050,10 @@ int __perf_session__set_tracepoints_handlers(struct perf_session *session,
 		evsel = perf_evlist__find_tracepoint_by_name(session->evlist, assocs[i].name);
 		if (evsel == NULL)
 			continue;
-
-		err = -EEXIST;
-		if (evsel->handler != NULL)
+		if (evsel->handler) {
+			err = -EEXIST;
 			goto out;
+		}
 		evsel->handler = assocs[i].handler;
 	}
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 4/4] perf strlist: Move an error code assignment in strlist__parse_list_entry()
  2017-01-23 15:20 [PATCH 0/4] perf: Fine-tuning for three function implementations SF Markus Elfring
                   ` (2 preceding siblings ...)
  2017-01-23 15:25 ` [PATCH 3/4] perf session: Move an error code assignment in __perf_session__set_tracepoints_handlers() SF Markus Elfring
@ 2017-01-23 15:26 ` SF Markus Elfring
  2017-01-23 23:32   ` Masami Hiramatsu
  3 siblings, 1 reply; 11+ messages in thread
From: SF Markus Elfring @ 2017-01-23 15:26 UTC (permalink / raw)
  To: Adrian Hunter, Alexander Shishkin, Arnaldo Carvalho de Melo,
	He Kuang, Ingo Molnar, Jiri Olsa, Masami Hiramatsu, Milian Wolff,
	Peter Zijlstra, Ravi Bangoria, Wang Nan
  Cc: LKML, kernel-janitors

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 23 Jan 2017 15:56:31 +0100

A local variable was set to an error code before a concrete error situation
was detected. Thus move the corresponding assignment into an if branch
to indicate a software failure there.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 tools/perf/util/strlist.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c
index 0d3dfcb919b4..a934be385a6d 100644
--- a/tools/perf/util/strlist.c
+++ b/tools/perf/util/strlist.c
@@ -118,9 +118,10 @@ static int strlist__parse_list_entry(struct strlist *slist, const char *s,
 		return strlist__load(slist, s + 7);
 
 	if (subst_dir) {
-		err = -ENOMEM;
-		if (asprintf(&subst, "%s/%s", subst_dir, s) < 0)
+		if (asprintf(&subst, "%s/%s", subst_dir, s) < 0) {
+			err = -ENOMEM;
 			goto out;
+		}
 
 		if (access(subst, F_OK) == 0) {
 			err = strlist__load(slist, subst);
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH 2/4] perf probe: Delete an unnecessary assignment in try_to_find_absolute_address()
  2017-01-23 15:24 ` [PATCH 2/4] perf probe: Delete an unnecessary assignment " SF Markus Elfring
@ 2017-01-23 22:47   ` Masami Hiramatsu
  2017-01-26 15:29   ` [tip:perf/core] " tip-bot for Markus Elfring
  1 sibling, 0 replies; 11+ messages in thread
From: Masami Hiramatsu @ 2017-01-23 22:47 UTC (permalink / raw)
  To: SF Markus Elfring
  Cc: Adrian Hunter, Alexander Shishkin, Arnaldo Carvalho de Melo,
	He Kuang, Ingo Molnar, Jiri Olsa, Milian Wolff, Peter Zijlstra,
	Ravi Bangoria, Wang Nan, LKML, kernel-janitors

On Mon, 23 Jan 2017 16:24:06 +0100
SF Markus Elfring <elfring@users.sourceforge.net> wrote:

> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Mon, 23 Jan 2017 15:10:19 +0100
> 
> Remove an error code assignment which is redundant in an if branch for
> the handling of a memory allocation failure because the same value was set
> for the local variable "err" before.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>


This looks good to me :)

Acked-by: Masami Hiramatsu <mhiramat@kernel.org>

Thanks!

> ---
>  tools/perf/util/probe-event.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
> index 6c7508337fe8..5a34c93b818a 100644
> --- a/tools/perf/util/probe-event.c
> +++ b/tools/perf/util/probe-event.c
> @@ -2956,10 +2956,9 @@ static int try_to_find_absolute_address(struct perf_probe_event *pev,
>  
>  	tev->nargs = pev->nargs;
>  	tev->args = zalloc(sizeof(struct probe_trace_arg) * tev->nargs);
> -	if (!tev->args) {
> -		err = -ENOMEM;
> +	if (!tev->args)
>  		goto errout;
> -	}
> +
>  	for (i = 0; i < tev->nargs; i++)
>  		copy_to_probe_trace_arg(&tev->args[i], &pev->args[i]);
>  
> -- 
> 2.11.0
> 


-- 
Masami Hiramatsu <mhiramat@kernel.org>

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/4] perf probe: Delete an unnecessary check in try_to_find_absolute_address()
  2017-01-23 15:22 ` [PATCH 1/4] perf probe: Delete an unnecessary check in try_to_find_absolute_address() SF Markus Elfring
@ 2017-01-23 22:48   ` Masami Hiramatsu
  2017-01-26 15:28   ` [tip:perf/core] " tip-bot for Markus Elfring
  1 sibling, 0 replies; 11+ messages in thread
From: Masami Hiramatsu @ 2017-01-23 22:48 UTC (permalink / raw)
  To: SF Markus Elfring
  Cc: Adrian Hunter, Alexander Shishkin, Arnaldo Carvalho de Melo,
	He Kuang, Ingo Molnar, Jiri Olsa, Milian Wolff, Peter Zijlstra,
	Ravi Bangoria, Wang Nan, LKML, kernel-janitors

On Mon, 23 Jan 2017 16:22:22 +0100
SF Markus Elfring <elfring@users.sourceforge.net> wrote:

> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Mon, 23 Jan 2017 14:54:26 +0100
> 
> Remove a condition check which is unnecessary at the end
> because this source code place should usually only be reached
> with a non-zero pointer.

Looks good to me :)

Acked-by: Masami Hiramatsu <mhiramat@kernel.org>

Thanks!

> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
>  tools/perf/util/probe-event.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
> index d281ae2b54e8..6c7508337fe8 100644
> --- a/tools/perf/util/probe-event.c
> +++ b/tools/perf/util/probe-event.c
> @@ -2966,10 +2966,8 @@ static int try_to_find_absolute_address(struct perf_probe_event *pev,
>  	return 1;
>  
>  errout:
> -	if (*tevs) {
> -		clear_probe_trace_events(*tevs, 1);
> -		*tevs = NULL;
> -	}
> +	clear_probe_trace_events(*tevs, 1);
> +	*tevs = NULL;
>  	return err;
>  }
>  
> -- 
> 2.11.0
> 


-- 
Masami Hiramatsu <mhiramat@kernel.org>

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 3/4] perf session: Move an error code assignment in __perf_session__set_tracepoints_handlers()
  2017-01-23 15:25 ` [PATCH 3/4] perf session: Move an error code assignment in __perf_session__set_tracepoints_handlers() SF Markus Elfring
@ 2017-01-23 22:56   ` Masami Hiramatsu
  0 siblings, 0 replies; 11+ messages in thread
From: Masami Hiramatsu @ 2017-01-23 22:56 UTC (permalink / raw)
  To: SF Markus Elfring
  Cc: Adrian Hunter, Alexander Shishkin, Arnaldo Carvalho de Melo,
	He Kuang, Ingo Molnar, Jiri Olsa, Milian Wolff, Peter Zijlstra,
	Ravi Bangoria, Wang Nan, LKML, kernel-janitors

On Mon, 23 Jan 2017 16:25:23 +0100
SF Markus Elfring <elfring@users.sourceforge.net> wrote:

> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Mon, 23 Jan 2017 15:43:13 +0100
> 
> A local variable was set to an error code before a concrete error situation
> was detected. Thus move the corresponding assignment into an if branch
> to indicate a software failure there.
> 
> This issue was detected by using the Coccinelle software.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
>  tools/perf/util/session.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
> index f268201048a0..98605ad4affd 100644
> --- a/tools/perf/util/session.c
> +++ b/tools/perf/util/session.c
> @@ -2050,10 +2050,10 @@ int __perf_session__set_tracepoints_handlers(struct perf_session *session,
>  		evsel = perf_evlist__find_tracepoint_by_name(session->evlist, assocs[i].name);
>  		if (evsel == NULL)
>  			continue;
> -
> -		err = -EEXIST;
> -		if (evsel->handler != NULL)
> +		if (evsel->handler) {
> +			err = -EEXIST;
>  			goto out;
> +		}
>  		evsel->handler = assocs[i].handler;
>  	}

Hmm, if we cleanup this function, it might be better not to use goto as below.

int __perf_session__set_tracepoints_handlers(struct perf_session *session,
                                             const struct perf_evsel_str_handler *assocs,
                                             size_t nr_assocs)
{
        struct perf_evsel *evsel;
        size_t i;
        int err = 0;

        for (i = 0; i < nr_assocs; i++) {
                /*
                 * Adding a handler for an event not in the session,
                 * just ignore it.
                 */
                evsel = perf_evlist__find_tracepoint_by_name(session->evlist, assocs[i].name);
                if (evsel == NULL)
                        continue;

                if (evsel->handler != NULL) {
                        err = -EEXIST;
                        break;
		}
                evsel->handler = assocs[i].handler;
        }

        return err;
}

Thank you,



-- 
Masami Hiramatsu <mhiramat@kernel.org>

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 4/4] perf strlist: Move an error code assignment in strlist__parse_list_entry()
  2017-01-23 15:26 ` [PATCH 4/4] perf strlist: Move an error code assignment in strlist__parse_list_entry() SF Markus Elfring
@ 2017-01-23 23:32   ` Masami Hiramatsu
  0 siblings, 0 replies; 11+ messages in thread
From: Masami Hiramatsu @ 2017-01-23 23:32 UTC (permalink / raw)
  To: SF Markus Elfring
  Cc: Adrian Hunter, Alexander Shishkin, Arnaldo Carvalho de Melo,
	He Kuang, Ingo Molnar, Jiri Olsa, Milian Wolff, Peter Zijlstra,
	Ravi Bangoria, Wang Nan, LKML, kernel-janitors

On Mon, 23 Jan 2017 16:26:24 +0100
SF Markus Elfring <elfring@users.sourceforge.net> wrote:

> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Mon, 23 Jan 2017 15:56:31 +0100
> 
> A local variable was set to an error code before a concrete error situation
> was detected. Thus move the corresponding assignment into an if branch
> to indicate a software failure there.
> 
> This issue was detected by using the Coccinelle software.

Looks good to me.

Acked-by: Masami Hiramatsu <mhiramat@kernel.org>

Thanks!

> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
>  tools/perf/util/strlist.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c
> index 0d3dfcb919b4..a934be385a6d 100644
> --- a/tools/perf/util/strlist.c
> +++ b/tools/perf/util/strlist.c
> @@ -118,9 +118,10 @@ static int strlist__parse_list_entry(struct strlist *slist, const char *s,
>  		return strlist__load(slist, s + 7);
>  
>  	if (subst_dir) {
> -		err = -ENOMEM;
> -		if (asprintf(&subst, "%s/%s", subst_dir, s) < 0)
> +		if (asprintf(&subst, "%s/%s", subst_dir, s) < 0) {
> +			err = -ENOMEM;
>  			goto out;
> +		}
>  
>  		if (access(subst, F_OK) == 0) {
>  			err = strlist__load(slist, subst);
> -- 
> 2.11.0
> 


-- 
Masami Hiramatsu <mhiramat@kernel.org>

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [tip:perf/core] perf probe: Delete an unnecessary check in try_to_find_absolute_address()
  2017-01-23 15:22 ` [PATCH 1/4] perf probe: Delete an unnecessary check in try_to_find_absolute_address() SF Markus Elfring
  2017-01-23 22:48   ` Masami Hiramatsu
@ 2017-01-26 15:28   ` tip-bot for Markus Elfring
  1 sibling, 0 replies; 11+ messages in thread
From: tip-bot for Markus Elfring @ 2017-01-26 15:28 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: wangnan0, ravi.bangoria, acme, peterz, hekuang,
	alexander.shishkin, mingo, milian.wolff, elfring, mhiramat, hpa,
	adrian.hunter, jolsa, linux-kernel, tglx

Commit-ID:  42e233cacc052bd545417c68155f2b9abd1bab72
Gitweb:     http://git.kernel.org/tip/42e233cacc052bd545417c68155f2b9abd1bab72
Author:     Markus Elfring <elfring@users.sourceforge.net>
AuthorDate: Mon, 23 Jan 2017 14:54:26 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 26 Jan 2017 11:42:55 -0300

perf probe: Delete an unnecessary check in try_to_find_absolute_address()

Remove a condition check which is unnecessary at the end
because this source code place should usually only be reached
with a non-zero pointer.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: kernel-janitors@vger.kernel.org
Link: http://lkml.kernel.org/r/a3f2473b-6383-a326-bce0-b826423608b8@users.sourceforge.net
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/probe-event.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 4a57c8a..cdfc468 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -3004,10 +3004,8 @@ static int try_to_find_absolute_address(struct perf_probe_event *pev,
 	return 1;
 
 errout:
-	if (*tevs) {
-		clear_probe_trace_events(*tevs, 1);
-		*tevs = NULL;
-	}
+	clear_probe_trace_events(*tevs, 1);
+	*tevs = NULL;
 	return err;
 }
 

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [tip:perf/core] perf probe: Delete an unnecessary assignment in try_to_find_absolute_address()
  2017-01-23 15:24 ` [PATCH 2/4] perf probe: Delete an unnecessary assignment " SF Markus Elfring
  2017-01-23 22:47   ` Masami Hiramatsu
@ 2017-01-26 15:29   ` tip-bot for Markus Elfring
  1 sibling, 0 replies; 11+ messages in thread
From: tip-bot for Markus Elfring @ 2017-01-26 15:29 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: wangnan0, hekuang, adrian.hunter, peterz, alexander.shishkin,
	linux-kernel, acme, hpa, mingo, elfring, tglx, jolsa, mhiramat,
	ravi.bangoria, milian.wolff

Commit-ID:  d1d0e29cb7d03a6019caa125e4c0288366a4f359
Gitweb:     http://git.kernel.org/tip/d1d0e29cb7d03a6019caa125e4c0288366a4f359
Author:     Markus Elfring <elfring@users.sourceforge.net>
AuthorDate: Mon, 23 Jan 2017 15:10:19 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 26 Jan 2017 11:42:56 -0300

perf probe: Delete an unnecessary assignment in try_to_find_absolute_address()

Remove an error code assignment which is redundant in an if branch for
the handling of a memory allocation failure because the same value was
set for the local variable "err" before.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: kernel-janitors@vger.kernel.org
Link: http://lkml.kernel.org/r/0ede09ec-79b6-c8bd-5b20-02c63ed98aab@users.sourceforge.net
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/probe-event.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index cdfc468..ded1e7d 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -2994,10 +2994,9 @@ static int try_to_find_absolute_address(struct perf_probe_event *pev,
 
 	tev->nargs = pev->nargs;
 	tev->args = zalloc(sizeof(struct probe_trace_arg) * tev->nargs);
-	if (!tev->args) {
-		err = -ENOMEM;
+	if (!tev->args)
 		goto errout;
-	}
+
 	for (i = 0; i < tev->nargs; i++)
 		copy_to_probe_trace_arg(&tev->args[i], &pev->args[i]);
 

^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2017-01-26 15:35 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-23 15:20 [PATCH 0/4] perf: Fine-tuning for three function implementations SF Markus Elfring
2017-01-23 15:22 ` [PATCH 1/4] perf probe: Delete an unnecessary check in try_to_find_absolute_address() SF Markus Elfring
2017-01-23 22:48   ` Masami Hiramatsu
2017-01-26 15:28   ` [tip:perf/core] " tip-bot for Markus Elfring
2017-01-23 15:24 ` [PATCH 2/4] perf probe: Delete an unnecessary assignment " SF Markus Elfring
2017-01-23 22:47   ` Masami Hiramatsu
2017-01-26 15:29   ` [tip:perf/core] " tip-bot for Markus Elfring
2017-01-23 15:25 ` [PATCH 3/4] perf session: Move an error code assignment in __perf_session__set_tracepoints_handlers() SF Markus Elfring
2017-01-23 22:56   ` Masami Hiramatsu
2017-01-23 15:26 ` [PATCH 4/4] perf strlist: Move an error code assignment in strlist__parse_list_entry() SF Markus Elfring
2017-01-23 23:32   ` Masami Hiramatsu

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).