From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Wang Nan <wangnan0@huawei.com>,
He Kuang <hekuang@huawei.com>, Jiri Olsa <jolsa@kernel.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Nilay Vaish <nilayvaish@gmail.com>, Zefan Li <lizefan@huawei.com>,
pi3orama@163.com, Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 10/18] perf record: Prepare picking perf_event_mmap_page from multiple evlists
Date: Mon, 27 Jun 2016 18:01:32 -0300 [thread overview]
Message-ID: <1467061300-5170-11-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1467061300-5170-1-git-send-email-acme@kernel.org>
From: Wang Nan <wangnan0@huawei.com>
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 <wangnan0@huawei.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nilay Vaish <nilayvaish@gmail.com>
Cc: Zefan Li <lizefan@huawei.com>
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 <acme@redhat.com>
---
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 18e9abc90759..b2b3b600adf5 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;
}
--
2.7.4
next prev parent reply other threads:[~2016-06-27 21:02 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-27 21:01 [GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 01/18] perf annotate: Remove unused hist_entry__annotate function Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 02/18] perf tools: Update makefile message for installing slang devel package Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 03/18] perf annotate: Generalize handling of 'ret' instructions Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 04/18] perf tools: Add more toolchain triplets Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 05/18] perf tools: Add documentation for perf.data on disk format Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 06/18] perf build: Add libbabeltrace to build-test Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 07/18] perf data convert: Include config.h header Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 08/18] perf record: Move mmap setup block to separate function Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 09/18] perf record: Prepare reading from multiple evlists in record__mmap_read_all() Arnaldo Carvalho de Melo
2016-06-27 21:01 ` Arnaldo Carvalho de Melo [this message]
2016-06-27 21:01 ` [PATCH 11/18] perf symbols: Use proper dso name for is_regular_file Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 12/18] perf data ctf: Add value_set_string() helper Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 13/18] perf data ctf: Pass convert options through opts structure Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 14/18] perf data ctf: Add 'all' option Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 15/18] perf data ctf: Prepare collect non-sample events Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 16/18] perf data ctf: Generate comm event to CTF output Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 17/18] perf data ctf: Add '--all' option for 'perf data convert' Arnaldo Carvalho de Melo
2016-06-27 21:01 ` [PATCH 18/18] perf data ctf: Generate fork and exit events to CTF output Arnaldo Carvalho de Melo
2016-06-28 7:02 ` [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar
2016-06-28 8:27 ` Jiri Olsa
2016-06-28 14:01 ` Arnaldo Carvalho de Melo
2016-06-28 14:12 ` Arnaldo Carvalho de Melo
2016-06-29 9:36 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467061300-5170-11-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=nilayvaish@gmail.com \
--cc=pi3orama@163.com \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).