perf test: Switch to new perf_mmap__read_event() interface for perf-record
authorKan Liang <kan.liang@linux.intel.com>
Thu, 1 Mar 2018 23:09:06 +0000 (18:09 -0500)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 5 Mar 2018 13:50:21 +0000 (10:50 -0300)
The perf test 'perf-record' still use the legacy interface.

No functional change.

Committer notes:

Testing it:

  # perf test PERF_RECORD
   8: PERF_RECORD_* events & perf_sample fields             : 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-9-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>
tools/perf/tests/perf-record.c

index 0afafab..31f3f70 100644 (file)
@@ -164,8 +164,14 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
 
                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;
                                const char *name = perf_event__name(type);
 
@@ -266,8 +272,9 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
                                        ++errs;
                                }
 
-                               perf_evlist__mmap_consume(evlist, i);
+                               perf_mmap__consume(md, false);
                        }
+                       perf_mmap__read_done(md);
                }
 
                /*