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

No functional change.

Committer notes:

Testing it:

  # perf test exit
  21: Number of exit events of a simple workload            : 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-13-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/task-exit.c

index 01b62b81751b6458bea6234a0703f919f3f29b77..02b0888b72a33d383d9249d9e6aa98b488fc865c 100644 (file)
@@ -47,6 +47,8 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused
        char sbuf[STRERR_BUFSIZE];
        struct cpu_map *cpus;
        struct thread_map *threads;
+       struct perf_mmap *md;
+       u64 end, start;
 
        signal(SIGCHLD, sig_handler);
 
@@ -110,13 +112,19 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused
        perf_evlist__start_workload(evlist);
 
 retry:
-       while ((event = perf_evlist__mmap_read(evlist, 0)) != NULL) {
+       md = &evlist->mmap[0];
+       if (perf_mmap__read_init(md, false, &start, &end) < 0)
+               goto out_init;
+
+       while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) {
                if (event->header.type == PERF_RECORD_EXIT)
                        nr_exit++;
 
-               perf_evlist__mmap_consume(evlist, 0);
+               perf_mmap__consume(md, false);
        }
+       perf_mmap__read_done(md);
 
+out_init:
        if (!exited || !nr_exit) {
                perf_evlist__poll(evlist, -1);
                goto retry;