From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <jolsa@redhat.com>
Cc: <linux-kernel@vger.kernel.org>, <pi3orama@163.com>,
<lizefan@huawei.com>, Wang Nan <wangnan0@huawei.com>,
He Kuang <hekuang@huawei.com>,
"Arnaldo Carvalho de Melo" <acme@redhat.com>,
Jiri Olsa <jolsa@kernel.org>,
"Masami Hiramatsu" <mhiramat@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
"Nilay Vaish" <nilayvaish@gmail.com>
Subject: [PATCH v13 4/8] perf record: Introduce rec->overwrite_evlist for overwritable events
Date: Mon, 4 Jul 2016 06:20:05 +0000 [thread overview]
Message-ID: <1467613209-191781-5-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1467613209-191781-1-git-send-email-wangnan0@huawei.com>
Create an auxiliary evlist for overwritable events.
Before mmap, build this evlist and set 'overwrite' and 'backward'
attribute. Since perf_evlist__mmap_ex() only maps events when
evsel->overwrite matches evlist's corresponding attributes, with
these two evlists an event goes to either rec->evlist or
rec->overwrite_evlist.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: Nilay Vaish <nilayvaish@gmail.com>
Cc: pi3orama@163.com
---
tools/perf/builtin-record.c | 59 ++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 56 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index b2b3b60..3b62295 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -51,6 +51,7 @@ struct record {
struct perf_data_file file;
struct auxtrace_record *itr;
struct perf_evlist *evlist;
+ struct perf_evlist *overwrite_evlist;
struct perf_session *session;
const char *progname;
int realtime_prio;
@@ -342,13 +343,41 @@ int auxtrace_record__snapshot_start(struct auxtrace_record *itr __maybe_unused)
#endif
+static int record__create_overwrite_evlist(struct record *rec)
+{
+ struct perf_evlist *evlist = rec->evlist;
+ struct perf_evsel *pos;
+
+ evlist__for_each_entry(evlist, pos) {
+ if (!pos->attr.write_backward)
+ continue;
+
+ if (!rec->overwrite_evlist) {
+ rec->overwrite_evlist = perf_evlist__new_aux(evlist);
+ if (rec->overwrite_evlist) {
+ rec->overwrite_evlist->backward = true;
+ rec->overwrite_evlist->overwrite = true;
+ return 0;
+ } else
+ return -ENOMEM;
+ }
+ }
+ return 0;
+}
+
static int record__mmap_evlist(struct record *rec,
- struct perf_evlist *evlist)
+ struct perf_evlist *evlist,
+ bool overwrite)
{
struct record_opts *opts = &rec->opts;
char msg[512];
- if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false,
+ /*
+ * Don't use evlist->overwrite because it is logically an
+ * internal attribute and is set by perf_evlist__mmap_ex().
+ * Avoid circular dependency.
+ */
+ if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, overwrite,
opts->auxtrace_mmap_pages,
opts->auxtrace_snapshot_mode) < 0) {
if (errno == EPERM) {
@@ -373,7 +402,23 @@ static int record__mmap_evlist(struct record *rec,
static int record__mmap(struct record *rec)
{
- return record__mmap_evlist(rec, rec->evlist);
+ int err;
+
+ err = record__create_overwrite_evlist(rec);
+ if (err)
+ return err;
+
+ err = record__mmap_evlist(rec, rec->evlist, false);
+ if (err)
+ return err;
+
+ if (!rec->overwrite_evlist)
+ return 0;
+
+ err = record__mmap_evlist(rec, rec->overwrite_evlist, true);
+ if (err)
+ return err;
+ return 0;
}
static int record__open(struct record *rec)
@@ -698,9 +743,14 @@ static const struct perf_event_mmap_page *record__pick_pc(struct record *rec)
{
const struct perf_event_mmap_page *pc;
+ /* Change it to a loop if a new aux evlist is added */
pc = perf_evlist__pick_pc(rec->evlist);
if (pc)
return pc;
+ pc = perf_evlist__pick_pc(rec->overwrite_evlist);
+ if (pc)
+ return pc;
+
return NULL;
}
@@ -1311,6 +1361,7 @@ static struct record record = {
.mmap2 = perf_event__process_mmap2,
.ordered_events = true,
},
+ .overwrite_evlist = NULL,
};
const char record_callchain_help[] = CALLCHAIN_RECORD_HELP
@@ -1614,6 +1665,8 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
err = __cmd_record(&record, argc, argv);
out_symbol_exit:
perf_evlist__delete(rec->evlist);
+ if (rec->overwrite_evlist)
+ perf_evlist__delete(rec->overwrite_evlist);
symbol__exit();
auxtrace_record__free(rec->itr);
return err;
--
1.8.3.4
next prev parent reply other threads:[~2016-07-04 6:21 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-04 6:20 [PATCH v13 0/8] perf tools: Support overwritable ring buffer Wang Nan
2016-07-04 6:20 ` [PATCH v13 1/8] perf tools: Drop redundant evsel->overwrite indicator Wang Nan
2016-07-06 10:53 ` Jiri Olsa
2016-07-06 10:55 ` Wangnan (F)
2016-07-04 6:20 ` [PATCH v13 2/8] perf evlist: Introduce aux evlist Wang Nan
2016-07-06 11:36 ` Jiri Olsa
2016-07-06 12:16 ` Wangnan (F)
2016-07-08 14:46 ` Jiri Olsa
2016-07-11 10:20 ` Wangnan (F)
2016-07-04 6:20 ` [PATCH v13 3/8] perf tests: Add testcase for auxiliary evlist Wang Nan
2016-07-04 6:20 ` Wang Nan [this message]
2016-07-04 6:20 ` [PATCH v13 5/8] perf record: Read from overwritable ring buffer Wang Nan
2016-07-06 11:37 ` Jiri Olsa
2016-07-06 11:38 ` Jiri Olsa
2016-07-06 12:03 ` Wangnan (F)
2016-07-06 12:34 ` Jiri Olsa
2016-07-07 4:59 ` Wangnan (F)
2016-07-04 6:20 ` [PATCH v13 6/8] perf tools: Enable overwrite settings Wang Nan
2016-07-04 6:20 ` [PATCH v13 7/8] perf tools: Don't warn about out of order event if write_backward is used Wang Nan
2016-07-04 6:20 ` [PATCH v13 8/8] perf tools: Add --tail-synthesize option Wang Nan
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=1467613209-191781-5-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=mhiramat@kernel.org \
--cc=namhyung@kernel.org \
--cc=nilayvaish@gmail.com \
--cc=pi3orama@163.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).