Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753083AbbG2IKt (ORCPT ); Wed, 29 Jul 2015 04:10:49 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56796 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752552AbbG2IKp (ORCPT ); Wed, 29 Jul 2015 04:10:45 -0400 Date: Wed, 29 Jul 2015 01:10:30 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: namhyung@kernel.org, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, acme@redhat.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, jolsa@kernel.org Reply-To: jolsa@kernel.org, a.p.zijlstra@chello.nl, dsahern@gmail.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, acme@redhat.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org In-Reply-To: <1437481927-29538-11-git-send-email-jolsa@kernel.org> References: <1437481927-29538-11-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evlist: Force perf_evlist__set_maps to propagate maps through events Git-Commit-ID: 3de5cfb04435b82aa427d0285df996ba73d2f426 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 Content-Length: 2714 Lines: 78 Commit-ID: 3de5cfb04435b82aa427d0285df996ba73d2f426 Gitweb: http://git.kernel.org/tip/3de5cfb04435b82aa427d0285df996ba73d2f426 Author: Jiri Olsa AuthorDate: Tue, 21 Jul 2015 14:31:30 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 21 Jul 2015 14:25:12 -0300 perf evlist: Force perf_evlist__set_maps to propagate maps through events Forcing perf_evlist__set_maps to propagate maps through events, so cpu/thread maps get set within evlist. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1437481927-29538-11-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.c | 17 +++++++++++++++++ tools/perf/util/evlist.h | 11 +++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index f7d9c77..6bfcab9b 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1150,6 +1150,23 @@ out_delete_threads: return -1; } +int perf_evlist__set_maps(struct perf_evlist *evlist, + struct cpu_map *cpus, + struct thread_map *threads) +{ + if (evlist->cpus) + cpu_map__put(evlist->cpus); + + evlist->cpus = cpus; + + if (evlist->threads) + thread_map__put(evlist->threads); + + evlist->threads = threads; + + return perf_evlist__propagate_maps(evlist, false); +} + int perf_evlist__apply_filters(struct perf_evlist *evlist, struct perf_evsel **err_evsel) { struct perf_evsel *evsel; diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 037633c..406a821 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -152,14 +152,9 @@ int perf_evlist__enable_event_idx(struct perf_evlist *evlist, void perf_evlist__set_selected(struct perf_evlist *evlist, struct perf_evsel *evsel); -static inline void perf_evlist__set_maps(struct perf_evlist *evlist, - struct cpu_map *cpus, - struct thread_map *threads) -{ - evlist->cpus = cpus; - evlist->threads = threads; -} - +int perf_evlist__set_maps(struct perf_evlist *evlist, + struct cpu_map *cpus, + struct thread_map *threads); int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target); int perf_evlist__apply_filters(struct perf_evlist *evlist, struct perf_evsel **err_evsel); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/