From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752905AbdBJInT (ORCPT ); Fri, 10 Feb 2017 03:43:19 -0500 Received: from terminus.zytor.com ([65.50.211.136]:53620 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752793AbdBJInQ (ORCPT ); Fri, 10 Feb 2017 03:43:16 -0500 Date: Thu, 9 Feb 2017 23:45:35 -0800 From: tip-bot for Taeung Song Message-ID: 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 Reply-To: tglx@linutronix.de, mingo@kernel.org, jolsa@kernel.org, wangnan0@huawei.com, namhyung@kernel.org, hpa@zytor.com, treeze.taeung@gmail.com, peterz@infradead.org, acme@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <1485952447-7013-2-git-send-email-treeze.taeung@gmail.com> References: <1485952447-7013-2-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Only increase index if perf_evsel__new_idx() succeeds Git-Commit-ID: 75fc5ae5cc53fff71041ecadeb3354a2b4c9fe42 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 75fc5ae5cc53fff71041ecadeb3354a2b4c9fe42 Gitweb: http://git.kernel.org/tip/75fc5ae5cc53fff71041ecadeb3354a2b4c9fe42 Author: Taeung Song AuthorDate: Wed, 1 Feb 2017 21:34:04 +0900 Committer: Arnaldo Carvalho de Melo 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 Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1485952447-7013-2-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- 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);