diff options
| author | Namhyung Kim | 2022-07-29 13:07:54 -0700 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo | 2022-08-01 09:28:24 -0300 |
| commit | 77d54a2cd6086d1cc3cadd124084b5d0d40b713e (patch) | |
| tree | a8c2ad9b8492aa8a1b5c3bb6e42bb412e79e3c91 /tools/perf | |
| parent | 9bd7021809de194b2f8b3ef10b5509e229f339ef (diff) | |
perf lock: Pass machine pointer to is_lock_function()
This is a preparation for later change to expose the function externally
so that it can be used without the implicit session data.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Blake Jones <blakejones@google.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Waiman Long <longman@redhat.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20220729200756.666106-2-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/builtin-lock.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 041801d8b6ac..10b854315b7a 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -947,10 +947,9 @@ end: return 0; } -static bool is_lock_function(u64 addr) +static bool is_lock_function(struct machine *machine, u64 addr) { if (!sched_text_start) { - struct machine *machine = &session->machines.host; struct map *kmap; struct symbol *sym; @@ -1002,6 +1001,7 @@ static int lock_contention_caller(struct evsel *evsel, struct perf_sample *sampl { struct thread *thread; struct callchain_cursor *cursor = &callchain_cursor; + struct machine *machine = &session->machines.host; struct symbol *sym; int skip = 0; int ret; @@ -1010,8 +1010,7 @@ static int lock_contention_caller(struct evsel *evsel, struct perf_sample *sampl if (show_thread_stats) return -1; - thread = machine__findnew_thread(&session->machines.host, - -1, sample->pid); + thread = machine__findnew_thread(machine, -1, sample->pid); if (thread == NULL) return -1; @@ -1038,7 +1037,7 @@ static int lock_contention_caller(struct evsel *evsel, struct perf_sample *sampl goto next; sym = node->ms.sym; - if (sym && !is_lock_function(node->ip)) { + if (sym && !is_lock_function(machine, node->ip)) { struct map *map = node->ms.map; u64 offset; @@ -1060,13 +1059,13 @@ next: static u64 callchain_id(struct evsel *evsel, struct perf_sample *sample) { struct callchain_cursor *cursor = &callchain_cursor; + struct machine *machine = &session->machines.host; struct thread *thread; u64 hash = 0; int skip = 0; int ret; - thread = machine__findnew_thread(&session->machines.host, - -1, sample->pid); + thread = machine__findnew_thread(machine, -1, sample->pid); if (thread == NULL) return -1; @@ -1091,7 +1090,7 @@ static u64 callchain_id(struct evsel *evsel, struct perf_sample *sample) if (++skip <= CONTENTION_STACK_SKIP) goto next; - if (node->ms.sym && is_lock_function(node->ip)) + if (node->ms.sym && is_lock_function(machine, node->ip)) goto next; hash ^= hash_long((unsigned long)node->ip, 64); |