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: Kan Liang <kan.liang@linux.intel.com>
Tested-by: Arnaldo 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: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index e7f1b182fc153f227f8541e485c47a27115a111e..1a93debc1e8d55987a994edf3f8fd1650688b548 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2472,8 +2472,14 @@ again:
 
        for (i = 0; i < evlist->nr_mmaps; i++) {
                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;
 
                        ++trace->nr_events;
@@ -2486,7 +2492,7 @@ again:
 
                        trace__handle_event(trace, event, &sample);
 next_event:
-                       perf_evlist__mmap_consume(evlist, i);
+                       perf_mmap__consume(md, false);
 
                        if (interrupted)
                                goto out_disable;
@@ -2496,6 +2502,7 @@ next_event:
                                draining = true;
                        }
                }
+               perf_mmap__read_done(md);
        }
 
        if (trace->nr_events == before) {