perf mmap: Use stored 'overwrite' in perf_mmap__consume()

[linux-2.6-block.git] / tools / perf / tests / openat-syscall-tp-fields.c

diff --git a/tools/perf/tests/openat-syscall-tp-fields.c b/tools/perf/tests/openat-syscall-tp-fields.c
index 43519267b93badf3426ecee4dae79c63b19e5e5c..620b21023f722e6e3ee34e8b3918501bde95e521 100644 (file)
--- a/tools/perf/tests/openat-syscall-tp-fields.c
+++ b/tools/perf/tests/openat-syscall-tp-fields.c
@@ -86,8 +86,14 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest
 
                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) {
                                const u32 type = event->header.type;
                                int tp_flags;
                                struct perf_sample sample;
@@ -95,7 +101,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest
                                ++nr_events;
 
                                if (type != PERF_RECORD_SAMPLE) {
-                                       perf_evlist__mmap_consume(evlist, i);
+                                       perf_mmap__consume(md, false);
                                        continue;
                                }
 
@@ -115,6 +121,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest
 
                                goto out_ok;
                        }
+                       perf_mmap__read_done(md);
                }
 
                if (nr_events == before)