From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753277AbbIPHe6 (ORCPT ); Wed, 16 Sep 2015 03:34:58 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39526 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751822AbbIPHe4 (ORCPT ); Wed, 16 Sep 2015 03:34:56 -0400 Date: Wed, 16 Sep 2015 00:34:43 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: mingo@kernel.org, adrian.hunter@intel.com, tglx@linutronix.de, kan.liang@intel.com, hpa@zytor.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com Reply-To: adrian.hunter@intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, jolsa@kernel.org, hpa@zytor.com, tglx@linutronix.de, kan.liang@intel.com In-Reply-To: <1441699142-18905-13-git-send-email-adrian.hunter@intel.com> References: <1441699142-18905-13-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evlist: Fix create_syswide_maps() not propagating maps Git-Commit-ID: 8c0498b6891d7ca5c379c6283de7fc7fe8eebe5c 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: 8c0498b6891d7ca5c379c6283de7fc7fe8eebe5c Gitweb: http://git.kernel.org/tip/8c0498b6891d7ca5c379c6283de7fc7fe8eebe5c Author: Adrian Hunter AuthorDate: Tue, 8 Sep 2015 10:59:00 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 15 Sep 2015 11:03:22 -0300 perf evlist: Fix create_syswide_maps() not propagating maps Fix it by making it call perf_evlist__set_maps() instead of setting the maps itself. Signed-off-by: Adrian Hunter Acked-by: Jiri Olsa Cc: Kan Liang Link: http://lkml.kernel.org/r/1441699142-18905-13-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 99267ab..c8fc8a2 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1400,6 +1400,8 @@ void perf_evlist__close(struct perf_evlist *evlist) static int perf_evlist__create_syswide_maps(struct perf_evlist *evlist) { + struct cpu_map *cpus; + struct thread_map *threads; int err = -ENOMEM; /* @@ -1411,20 +1413,19 @@ static int perf_evlist__create_syswide_maps(struct perf_evlist *evlist) * error, and we may not want to do that fallback to a * default cpu identity map :-\ */ - evlist->cpus = cpu_map__new(NULL); - if (evlist->cpus == NULL) + cpus = cpu_map__new(NULL); + if (!cpus) goto out; - evlist->threads = thread_map__new_dummy(); - if (evlist->threads == NULL) - goto out_free_cpus; + threads = thread_map__new_dummy(); + if (!threads) + goto out_put; - err = 0; + perf_evlist__set_maps(evlist, cpus, threads); out: return err; -out_free_cpus: - cpu_map__put(evlist->cpus); - evlist->cpus = NULL; +out_put: + cpu_map__put(cpus); goto out; }