perf tools: Align buildid list output for short build ids

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>
Link: https://lore.kernel.org/r/20201013192441.1299447-9-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index ca965845b35e7a387405faad4949b1ec7e94ffda..55c11e854fe4622eb8cd90348bee2202ad3c004a 100644 (file)
--- 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 f926c96bf230829f8431802f8cbe40b0e52618b3..d8cb4f5680a4ae85b408f05525e638fc9edee35a 100644 (file)
--- 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 87161e4318306442bfb3486b3c6a88db1b2aea4f..183a81d5b2f92c8dead68962fdd7d33862aa03a4 100644 (file)
--- 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;
 }