Message ID | 20240623064850.83720-2-atrajeev@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | Handled Elsewhere, archived |
Headers | show |
Series | [V4,1/3] tools/perf: Fix the string match for "/tmp/perf-$PID.map" files in dso__load | expand |
On 23/06/24 09:48, Athira Rajeev wrote: > 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 perf_pid_map_tid and > is_perf_pid_map_name which looks for proper pattern of > form: "/tmp/perf-$PID.map" for these checks. > > Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Add a Fixes tag, then Reviewed-by: Adrian Hunter <adrian.hunter@intel.com> > --- > 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..846828ea1f00 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 (perf_pid_map_tid(dso__long_name(dso), &tid)) { > 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;
On Tue, Jun 25, 2024 at 5:03 AM Adrian Hunter <adrian.hunter@intel.com> wrote: > > On 23/06/24 09:48, Athira Rajeev wrote: > > 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 perf_pid_map_tid and > > is_perf_pid_map_name which looks for proper pattern of > > form: "/tmp/perf-$PID.map" for these checks. > > > > Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com> > > Add a Fixes tag, then > > Reviewed-by: Adrian Hunter <adrian.hunter@intel.com> Thanks, but I'm not sure which commit I can add the Fixes tag because the original commit 80d496be89ed is too old and I'm sure we added a lot of changes after that. Namhyung > > > --- > > 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..846828ea1f00 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 (perf_pid_map_tid(dso__long_name(dso), &tid)) { > > 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; >
diff --git a/tools/perf/util/dsos.c b/tools/perf/util/dsos.c index ab3d0c01dd63..846828ea1f00 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 (perf_pid_map_tid(dso__long_name(dso), &tid)) { 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;
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 perf_pid_map_tid and is_perf_pid_map_name which looks for proper pattern of form: "/tmp/perf-$PID.map" for these checks. Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com> --- tools/perf/util/dsos.c | 2 +- tools/perf/util/srcline.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)