From 447ec4e5fa339b30537d899447e73a103edef6d8 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Tue, 2 Aug 2022 12:10:02 -0700 Subject: perf lock: Introduce struct lock_contention The lock_contention struct is to carry related fields together and to minimize the change when we add new config options. Signed-off-by: Namhyung Kim Cc: Blake Jones Cc: Boqun Feng Cc: Davidlohr Bueso Cc: Ian Rogers Cc: Ingo Molnar Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Song Liu Cc: Waiman Long Cc: Will Deacon Link: https://lore.kernel.org/r/20220802191004.347740-1-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-lock.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'tools/perf/builtin-lock.c') diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 2a09f369a59c..4bc521adbd60 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -1595,7 +1595,10 @@ static int __cmd_contention(int argc, const char **argv) .mode = PERF_DATA_MODE_READ, .force = force, }; - struct evlist *evlist = NULL; + struct lock_contention con = { + .target = &target, + .result = &lockhash_table[0], + }; session = perf_session__new(use_bpf ? NULL : &data, &eops); if (IS_ERR(session)) { @@ -1621,24 +1624,26 @@ static int __cmd_contention(int argc, const char **argv) signal(SIGCHLD, sighandler); signal(SIGTERM, sighandler); - evlist = evlist__new(); - if (evlist == NULL) { + con.machine = &session->machines.host; + + con.evlist = evlist__new(); + if (con.evlist == NULL) { err = -ENOMEM; goto out_delete; } - err = evlist__create_maps(evlist, &target); + err = evlist__create_maps(con.evlist, &target); if (err < 0) goto out_delete; if (argc) { - err = evlist__prepare_workload(evlist, &target, + err = evlist__prepare_workload(con.evlist, &target, argv, false, NULL); if (err < 0) goto out_delete; } - if (lock_contention_prepare(evlist, &target) < 0) { + if (lock_contention_prepare(&con) < 0) { pr_err("lock contention BPF setup failed\n"); goto out_delete; } @@ -1673,13 +1678,13 @@ static int __cmd_contention(int argc, const char **argv) if (use_bpf) { lock_contention_start(); if (argc) - evlist__start_workload(evlist); + evlist__start_workload(con.evlist); /* wait for signal */ pause(); lock_contention_stop(); - lock_contention_read(&session->machines.host, &lockhash_table[0]); + lock_contention_read(&con); } else { err = perf_session__process_events(session); if (err) @@ -1692,7 +1697,7 @@ static int __cmd_contention(int argc, const char **argv) print_contention_result(); out_delete: - evlist__delete(evlist); + evlist__delete(con.evlist); lock_contention_finish(); perf_session__delete(session); return err; -- cgit v1.2.3