korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-05 01:54:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf record: Prepare reading from multiple evlists in record__mmap_read_all()

Browse Source 
Following commits introduce new evlists to record. This patch adjusts
record__mmap_read_all() and record__mmap_read(): converting original
record__mmap_read_all() to record__mmap_read_evlist(), read from one
evlist; makes record__mmap_read() reading from specific evlist.
record__mmap_read_all() will be improved to read 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-3-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Wang Nan 2016-06-27 10:24:04 +00:00 committed by Arnaldo Carvalho de Melo
parent cda57a8c74
commit cb21686b7d
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/perf/builtin-record.c
View File

@ -132,9 +132,9 @@ rb_find_range(struct perf_evlist *evlist,
return backward_rb_find_range(data, mask, head, start, end);
}
static int record__mmap_read(struct record *rec, int idx)
static int record__mmap_read(struct record *rec, struct perf_evlist *evlist, int idx)
{
struct perf_mmap *md = &rec->evlist->mmap[idx];
struct perf_mmap *md = &evlist->mmap[idx];
u64 head = perf_mmap__read_head(md);
u64 old = md->prev;
u64 end = head, start = old;
@ -143,7 +143,7 @@ static int record__mmap_read(struct record *rec, int idx)
void *buf;
int rc = 0;
if (rb_find_range(rec->evlist, data, md->mask, head,
if (rb_find_range(evlist, data, md->mask, head,
old, &start, &end))
return -1;
@ -157,7 +157,7 @@ static int record__mmap_read(struct record *rec, int idx)
WARN_ONCE(1, "failed to keep up with mmap data. (warn only once)\n");
md->prev = head;
perf_evlist__mmap_consume(rec->evlist, idx);
perf_evlist__mmap_consume(evlist, idx);
return 0;
}
@ -182,7 +182,7 @@ static int record__mmap_read(struct record *rec, int idx)
}
md->prev = head;
perf_evlist__mmap_consume(rec->evlist, idx);
perf_evlist__mmap_consume(evlist, idx);
out:
return rc;
}
@ -498,17 +498,20 @@ static struct perf_event_header finished_round_event = {
.type = PERF_RECORD_FINISHED_ROUND,
};
static int record__mmap_read_all(struct record *rec)
static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evlist)
{
u64 bytes_written = rec->bytes_written;
int i;
int rc = 0;
for (i = 0; i < rec->evlist->nr_mmaps; i++) {
struct auxtrace_mmap *mm = &rec->evlist->mmap[i].auxtrace_mmap;
if (!evlist)
return 0;
if (rec->evlist->mmap[i].base) {
if (record__mmap_read(rec, i) != 0) {
for (i = 0; i < evlist->nr_mmaps; i++) {
struct auxtrace_mmap *mm = &evlist->mmap[i].auxtrace_mmap;
if (evlist->mmap[i].base) {
if (record__mmap_read(rec, evlist, i) != 0) {
rc = -1;
goto out;
}
@ -532,6 +535,17 @@ out:
return rc;
}
static int record__mmap_read_all(struct record *rec)
{
int err;
err = record__mmap_read_evlist(rec, rec->evlist);
if (err)
return err;
return err;
}
static void record__init_features(struct record *rec)
{
struct perf_session *session = rec->session;