Commit d7f55c62 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo

perf trace: Switch to new perf_mmap__read_event() interface

The 'perf trace' utility still use the legacy interface.

Switch to the new perf_mmap__read_event() interface.

No functional change.
Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1519945751-37786-2-git-send-email-kan.liang@linux.intel.com
[ Changed bool parameters from 0 to 'false', as per Jiri comment ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 53172f90
...@@ -2472,8 +2472,14 @@ static int trace__run(struct trace *trace, int argc, const char **argv) ...@@ -2472,8 +2472,14 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
for (i = 0; i < evlist->nr_mmaps; i++) { for (i = 0; i < evlist->nr_mmaps; i++) {
union perf_event *event; union perf_event *event;
struct perf_mmap *md;
u64 end, start;
while ((event = perf_evlist__mmap_read(evlist, i)) != NULL) { md = &evlist->mmap[i];
if (perf_mmap__read_init(md, false, &start, &end) < 0)
continue;
while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) {
struct perf_sample sample; struct perf_sample sample;
++trace->nr_events; ++trace->nr_events;
...@@ -2486,7 +2492,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) ...@@ -2486,7 +2492,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
trace__handle_event(trace, event, &sample); trace__handle_event(trace, event, &sample);
next_event: next_event:
perf_evlist__mmap_consume(evlist, i); perf_mmap__consume(md, false);
if (interrupted) if (interrupted)
goto out_disable; goto out_disable;
...@@ -2496,6 +2502,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) ...@@ -2496,6 +2502,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
draining = true; draining = true;
} }
} }
perf_mmap__read_done(md);
} }
if (trace->nr_events == before) { if (trace->nr_events == before) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment