perf test: Add test case for pmu event new style format

[android-x86/kernel.git] / tools / perf / builtin-lock.c

diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index 6148afc..e7ec715 100644 (file)
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -852,7 +852,7 @@ static int __cmd_report(bool display_info)
        struct perf_tool eops = {
                .sample          = process_sample_event,
                .comm            = perf_event__process_comm,
-               .ordered_samples = true,
+               .ordered_events  = true,
        };
        struct perf_data_file file = {
                .path = input_name,
@@ -862,9 +862,11 @@ static int __cmd_report(bool display_info)
        session = perf_session__new(&file, false, &eops);
        if (!session) {
                pr_err("Initializing perf session failed\n");
-               return -ENOMEM;
+               return -1;
        }
 
+       symbol__init(&session->header.env);
+
        if (!perf_session__has_traces(session, "lock record"))
                goto out_delete;
 
@@ -974,7 +976,6 @@ int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused)
        unsigned int i;
        int rc = 0;
 
-       symbol__init();
        for (i = 0; i < LOCKHASH_SIZE; i++)
                INIT_LIST_HEAD(lockhash_table + i);