From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752666AbbFZIpb (ORCPT ); Fri, 26 Jun 2015 04:45:31 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52195 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751975AbbFZIpZ (ORCPT ); Fri, 26 Jun 2015 04:45:25 -0400 Date: Fri, 26 Jun 2015 01:45:07 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: adrian.hunter@intel.com, linux-kernel@vger.kernel.org, hpa@zytor.com, namhyung@kernel.org, acme@redhat.com, jolsa@kernel.org, a.p.zijlstra@chello.nl, ak@linux.intel.com, mingo@kernel.org, dsahern@gmail.com, tglx@linutronix.de, eranian@google.com Reply-To: ak@linux.intel.com, mingo@kernel.org, dsahern@gmail.com, tglx@linutronix.de, eranian@google.com, linux-kernel@vger.kernel.org, hpa@zytor.com, adrian.hunter@intel.com, acme@redhat.com, namhyung@kernel.org, a.p.zijlstra@chello.nl, jolsa@kernel.org In-Reply-To: <1435012588-9007-6-git-send-email-jolsa@kernel.org> References: <1435012588-9007-6-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf evlist: Propagate cpu maps to evsels in an evlist Git-Commit-ID: b7f0c203586b91419ff9aa9b1115e261082ff5b4 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: b7f0c203586b91419ff9aa9b1115e261082ff5b4 Gitweb: http://git.kernel.org/tip/b7f0c203586b91419ff9aa9b1115e261082ff5b4 Author: Jiri Olsa AuthorDate: Tue, 23 Jun 2015 00:36:06 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 25 Jun 2015 15:15:51 -0300 perf evlist: Propagate cpu maps to evsels in an evlist Propagate evlist's cpu_map object through all the evsel objects, while keeping already configured evsel->cpus. It'll be handy to access evsel's cpus directly in following patches. Signed-off-by: Jiri Olsa Cc: Adrian Hunter Cc: Andi Kleen Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1435012588-9007-6-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index a8d18a3..214affa 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1101,6 +1101,29 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages, return perf_evlist__mmap_ex(evlist, pages, overwrite, 0, false); } +static int perf_evlist__propagate_maps(struct perf_evlist *evlist, + struct target *target) +{ + struct perf_evsel *evsel; + + evlist__for_each(evlist, evsel) { + /* + * We already have cpus for evsel (via PMU sysfs) so + * keep it, if there's no target cpu list defined. + */ + if (evsel->cpus && target->cpu_list) + cpu_map__put(evsel->cpus); + + if (!evsel->cpus || target->cpu_list) + evsel->cpus = cpu_map__get(evlist->cpus); + + if (!evsel->cpus) + return -ENOMEM; + } + + return 0; +} + int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target) { evlist->threads = thread_map__new_str(target->pid, target->tid, @@ -1117,7 +1140,7 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target) if (evlist->cpus == NULL) goto out_delete_threads; - return 0; + return perf_evlist__propagate_maps(evlist, target); out_delete_threads: thread_map__put(evlist->threads);