Re: [PATCH V2 2/3] tools/perf: Use is_perf_pid_map_name helper function to check dso's of pattern /tmp/perf-%d.map
From: Adrian Hunter <adrian.hunter@intel.com>
Date: 2024-06-18 07:11:33
Also in:
linux-perf-users, lkml
On 17/06/24 16:03, Athira Rajeev wrote:
quoted hunk ↗ jump to hunk
commit 80d496be89ed ("perf report: Add support for profiling JIT generated code") added support for profiling JIT generated code. This patch handles dso's of form "/tmp/perf-$PID.map". Some of the references doesn't check exactly for same pattern. some uses "if (!strncmp(dso_name, "/tmp/perf-", 10))". Fix this by using helper function is_perf_pid_map_name which looks for proper pattern of form: "/tmp/perf-$PID.map" for these checks. Signed-off-by: Athira Rajeev <redacted> --- tools/perf/util/dsos.c | 2 +- tools/perf/util/srcline.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)diff --git a/tools/perf/util/dsos.c b/tools/perf/util/dsos.c index ab3d0c01dd63..23cd02aa701d 100644 --- a/tools/perf/util/dsos.c +++ b/tools/perf/util/dsos.c@@ -275,7 +275,7 @@ static void dso__set_basename(struct dso *dso) char *base, *lname; int tid; - if (sscanf(dso__long_name(dso), "/tmp/perf-%d.map", &tid) == 1) { + if (is_perf_pid_map_name(dso__long_name(dso))) {
Perhaps add another helper for this case:
bool perf_pid_map_tid(const char *dso_name, int *tid)
{
return sscanf(dso_name, "/tmp/perf-%d.map", &tid) == 1;
}
bool is_perf_pid_map_name(const char *dso_name)
{
int tid;
return perf_pid_map_tid(dso_name, &tid);
}
And then:
if (perf_pid_map_tid(dso__long_name(dso), &tid)) {
quoted hunk ↗ jump to hunk
if (asprintf(&base, "[JIT] tid %d", tid) < 0) return; } else {diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c index 9d670d8c1c08..51eb78993fe2 100644 --- a/tools/perf/util/srcline.c +++ b/tools/perf/util/srcline.c@@ -39,7 +39,7 @@ static const char *srcline_dso_name(struct dso *dso) if (dso_name[0] == '[') return NULL; - if (!strncmp(dso_name, "/tmp/perf-", 10)) + if (is_perf_pid_map_name(dso_name)) return NULL; return dso_name;