perf test: Switch to new perf_mmap__read_event() interface for 'code reading' test

The perf test 'object code reading' still use the legacy interface.

No functional change.

Committer notes:

Testing:

  # perf test reading
  23: Object code reading: Ok
  #

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-5-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/tests/code-reading.c b/tools/perf/tests/code-reading.c
index c7115d36951108ba38b072c2fedaccd936409945..03ed8c77b1bb69d11aea6a3e87af8d0f7dea5332 100644 (file)
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -409,15 +409,22 @@ static int process_events(struct machine *machine, struct perf_evlist *evlist,
                          struct state *state)
 {
        union perf_event *event;
+       struct perf_mmap *md;
+       u64 end, start;
        int i, ret;
 
        for (i = 0; i < evlist->nr_mmaps; i++) {
-               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) {
                        ret = process_event(machine, evlist, event, state);
-                       perf_evlist__mmap_consume(evlist, i);
+                       perf_mmap__consume(md, false);
                        if (ret < 0)
                                return ret;
                }
+               perf_mmap__read_done(md);
        }
        return 0;
 }