public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Taeung Song <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: treeze.taeung@gmail.com, peterz@infradead.org,
	linux-kernel@vger.kernel.org, acme@redhat.com, jolsa@kernel.org,
	wangnan0@huawei.com, namhyung@kernel.org, tglx@linutronix.de,
	mingo@kernel.org, hpa@zytor.com
Subject: [tip:perf/core] perf tools: Only increase index if perf_evsel__new_idx() succeeds
Date: Thu, 9 Feb 2017 23:45:35 -0800	[thread overview]
Message-ID: <tip-75fc5ae5cc53fff71041ecadeb3354a2b4c9fe42@git.kernel.org> (raw)
In-Reply-To: <1485952447-7013-2-git-send-email-treeze.taeung@gmail.com>

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

  reply	other threads:[~2017-02-10  8:43 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-01 12:34 [PATCH v3 0/4] Fill in lacking parts and Refactor several parts Taeung Song
2017-02-01 12:34 ` [PATCH v3 1/4] perf tools: Only increase index if perf_evsel__new_idx() succeeds Taeung Song
2017-02-10  7:45   ` tip-bot for Taeung Song [this message]
2017-02-01 12:34 ` [PATCH v3 2/4] perf tools: Fill in a lacking part no checking NULL after zalloc() in parse-events.c Taeung Song
2017-02-10  7:46   ` [tip:perf/core] perf tools: Add missing check for failure in a zalloc() call tip-bot for Taeung Song
2017-02-01 12:34 ` [PATCH v3 3/4] perf tools: Use zfree() instead of free() and assigning NULL to the pointer Taeung Song
2017-02-10  7:46   ` [tip:perf/core] perf tools: Use zfree() instead of ad hoc equivalent tip-bot for Taeung Song
2017-02-01 12:34 ` [PATCH v3 4/4] perf tools: Use zfree() to be more safe in parse-events.c Taeung Song

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=tip-75fc5ae5cc53fff71041ecadeb3354a2b4c9fe42@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=treeze.taeung@gmail.com \
    --cc=wangnan0@huawei.com \
    /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