diff options
Diffstat (limited to 'tools/perf/tests/code-reading.c')
| -rw-r--r-- | tools/perf/tests/code-reading.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c index 653a8fe2db95..e3fedfa2906e 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -275,19 +275,8 @@ static int process_event(struct machine *machine, struct perf_evlist *evlist, if (event->header.type == PERF_RECORD_SAMPLE) return process_sample_event(machine, evlist, event, state); - if (event->header.type == PERF_RECORD_THROTTLE || - event->header.type == PERF_RECORD_UNTHROTTLE) - return 0; - - if (event->header.type < PERF_RECORD_MAX) { - int ret; - - ret = machine__process_event(machine, event, NULL); - if (ret < 0) - pr_debug("machine__process_event failed, event type %u\n", - event->header.type); - return ret; - } + if (event->header.type < PERF_RECORD_MAX) + return machine__process_event(machine, event); return 0; } @@ -391,7 +380,7 @@ static int do_test_code_reading(bool try_kcore) struct machines machines; struct machine *machine; struct thread *thread; - struct record_opts opts = { + struct perf_record_opts opts = { .mmap_pages = UINT_MAX, .user_freq = UINT_MAX, .user_interval = ULLONG_MAX, @@ -452,7 +441,7 @@ static int do_test_code_reading(bool try_kcore) } ret = perf_event__synthesize_thread_map(NULL, threads, - perf_event__process, machine, false); + perf_event__process, machine); if (ret < 0) { pr_debug("perf_event__synthesize_thread_map failed\n"); goto out_err; @@ -540,11 +529,14 @@ static int do_test_code_reading(bool try_kcore) err = TEST_CODE_READING_OK; out_err: if (evlist) { + perf_evlist__munmap(evlist); + perf_evlist__close(evlist); perf_evlist__delete(evlist); - } else { + } + if (cpus) cpu_map__delete(cpus); + if (threads) thread_map__delete(threads); - } machines__destroy_kernel_maps(&machines); machine__delete_threads(machine); machines__exit(&machines); |