[tip:perf/core] perf tools: Only increase index if perf_evsel__new_idx() succeeds

From	tip-bot for Taeung Song <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:perf/core] perf tools: Only increase index if perf_evsel__new_idx() succeeds
Date	2017-02-10 09:50 +0100
Message-ID	<t9f3Y-140-11@gated-at.bofh.it> (permalink)
References	<t62mC-5Z6-23@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Commit-ID:  75fc5ae5cc53fff71041ecadeb3354a2b4c9fe42
Gitweb:     http://git.kernel.org/tip/75fc5ae5cc53fff71041ecadeb3354a2b4c9fe42
Author:     Taeung Song <treeze.taeung@gmail.com>
AuthorDate: Wed, 1 Feb 2017 21:34:04 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 8 Feb 2017 09:41:10 -0300

perf tools: Only increase index if perf_evsel__new_idx() succeeds

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1485952447-7013-2-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/parse-events.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 6dbcba7..2720600 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -310,10 +310,11 @@ __add_event(struct list_head *list, int *idx,
 
 	event_attr_init(attr);
 
-	evsel = perf_evsel__new_idx(attr, (*idx)++);
+	evsel = perf_evsel__new_idx(attr, *idx);
 	if (!evsel)
 		return NULL;
 
+	(*idx)++;
 	evsel->cpus     = cpu_map__get(cpus);
 	evsel->own_cpus = cpu_map__get(cpus);

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

Thread

[PATCH v3 0/4] Fill in lacking parts and Refactor several parts Taeung Song <treeze.taeung@gmail.com> - 2017-02-01 13:40 +0100
  [PATCH v3 1/4] perf tools: Only increase index if perf_evsel__new_idx() succeeds Taeung Song <treeze.taeung@gmail.com> - 2017-02-01 13:40 +0100
    [tip:perf/core] perf tools: Only increase index if  perf_evsel__new_idx() succeeds tip-bot for Taeung Song <tipbot@zytor.com> - 2017-02-10 09:50 +0100

csiph-web