Messages in this thread | | | From | Ian Rogers <> | Date | Wed, 30 Sep 2020 22:35:01 -0700 | Subject | Re: [PATCH 9/9] perf tools: Align buildid list output for short build ids |
| |
On Wed, Sep 30, 2020 at 10:15 AM Jiri Olsa <jolsa@kernel.org> wrote: > > With shorter md5 build ids we need to align their > paths properly with other build ids: > > $ perf buildid-list > 17f4e448cc746582ea1881528deb549f7fdb3fd5 [kernel.kallsyms] > a50e350e97c43b4708d09bcd85ebfff7 .../tools/perf/buildid-ex-md5 > 1805c738c8f3ec0f47b7ea09080c28f34d18a82b /usr/lib64/ld-2.31.so > > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Ian Rogers <irogers@google.com>
Thanks, Ian
> --- > tools/perf/util/dso.c | 2 +- > tools/perf/util/dso.h | 1 - > tools/perf/util/dsos.c | 6 ++++-- > 3 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c > index ca965845b35e..55c11e854fe4 100644 > --- a/tools/perf/util/dso.c > +++ b/tools/perf/util/dso.c > @@ -1369,7 +1369,7 @@ int dso__kernel_module_get_build_id(struct dso *dso, > return 0; > } > > -size_t dso__fprintf_buildid(struct dso *dso, FILE *fp) > +static size_t dso__fprintf_buildid(struct dso *dso, FILE *fp) > { > char sbuild_id[SBUILD_ID_SIZE]; > > diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h > index f926c96bf230..d8cb4f5680a4 100644 > --- a/tools/perf/util/dso.h > +++ b/tools/perf/util/dso.h > @@ -362,7 +362,6 @@ struct dso *machine__findnew_kernel(struct machine *machine, const char *name, > > void dso__reset_find_symbol_cache(struct dso *dso); > > -size_t dso__fprintf_buildid(struct dso *dso, FILE *fp); > size_t dso__fprintf_symbols_by_name(struct dso *dso, FILE *fp); > size_t dso__fprintf(struct dso *dso, FILE *fp); > > diff --git a/tools/perf/util/dsos.c b/tools/perf/util/dsos.c > index 87161e431830..183a81d5b2f9 100644 > --- a/tools/perf/util/dsos.c > +++ b/tools/perf/util/dsos.c > @@ -287,10 +287,12 @@ size_t __dsos__fprintf_buildid(struct list_head *head, FILE *fp, > size_t ret = 0; > > list_for_each_entry(pos, head, node) { > + char sbuild_id[SBUILD_ID_SIZE]; > + > if (skip && skip(pos, parm)) > continue; > - ret += dso__fprintf_buildid(pos, fp); > - ret += fprintf(fp, " %s\n", pos->long_name); > + build_id__sprintf(&pos->bid, sbuild_id); > + ret += fprintf(fp, "%-40s %s\n", sbuild_id, pos->long_name); > } > return ret; > } > -- > 2.26.2 >
| |