From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752059AbcF2Joa (ORCPT ); Wed, 29 Jun 2016 05:44:30 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34478 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751141AbcF2Jo1 (ORCPT ); Wed, 29 Jun 2016 05:44:27 -0400 Date: Wed, 29 Jun 2016 02:44:17 -0700 From: tip-bot for Wang Nan Message-ID: Cc: mingo@kernel.org, namhyung@kernel.org, nilayvaish@gmail.com, wangnan0@huawei.com, lizefan@huawei.com, acme@redhat.com, tglx@linutronix.de, jolsa@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, mhiramat@kernel.org, hekuang@huawei.com Reply-To: nilayvaish@gmail.com, mingo@kernel.org, namhyung@kernel.org, hekuang@huawei.com, lizefan@huawei.com, wangnan0@huawei.com, acme@redhat.com, jolsa@kernel.org, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mhiramat@kernel.org In-Reply-To: <1467023052-146749-4-git-send-email-wangnan0@huawei.com> References: <1467023052-146749-4-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf record: Prepare picking perf_event_mmap_page from multiple evlists Git-Commit-ID: ee667f947c926eda1b8d6eccd0894bfbed75b6e3 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: ee667f947c926eda1b8d6eccd0894bfbed75b6e3 Gitweb: http://git.kernel.org/tip/ee667f947c926eda1b8d6eccd0894bfbed75b6e3 Author: Wang Nan AuthorDate: Mon, 27 Jun 2016 10:24:05 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 28 Jun 2016 10:54:54 -0300 perf record: Prepare picking perf_event_mmap_page from multiple evlists Following commits introduce new evlists to record. This patch adjusts record__pick_pc() and introduces perf_evlist__pick_pc() to read control page from one specific evlist. record__pick_pc() will be improved to search control page from multiple evlists. Signed-off-by: Wang Nan Cc: He Kuang Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Nilay Vaish Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1467023052-146749-4-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 18e9abc..b2b3b60 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -686,10 +686,21 @@ perf_event__synth_time_conv(const struct perf_event_mmap_page *pc __maybe_unused return 0; } +static const struct perf_event_mmap_page * +perf_evlist__pick_pc(struct perf_evlist *evlist) +{ + if (evlist && evlist->mmap && evlist->mmap[0].base) + return evlist->mmap[0].base; + return NULL; +} + static const struct perf_event_mmap_page *record__pick_pc(struct record *rec) { - if (rec->evlist && rec->evlist->mmap && rec->evlist->mmap[0].base) - return rec->evlist->mmap[0].base; + const struct perf_event_mmap_page *pc; + + pc = perf_evlist__pick_pc(rec->evlist); + if (pc) + return pc; return NULL; }