Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | From | Namhyung Kim <> | Subject | [PATCH 1/3] perf lock: Pass machine pointer to is_lock_function() | Date | Fri, 29 Jul 2022 13:07:54 -0700 |
| |
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> --- tools/perf/builtin-lock.c | 15 +++++++-------- 1 file 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 @@ static int report_lock_release_event(struct evsel *evsel, 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 @@ static int lock_contention_caller(struct evsel *evsel, struct perf_sample *sampl 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); -- 2.37.1.455.g008518b4e5-goog
| ![\](/images/icornerr.gif) |