2 files changed, 28 insertions, 4 deletions

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 93e4b52ccfe4..53de9c4488d8 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -212,14 +212,21 @@ int build_id__sprintf(u8 *self, int len, char *bf)
         return raw - self;
 }
 
-size_t dso__fprintf(struct dso *self, FILE *fp)
+size_t dso__fprintf_buildid(struct dso *self, FILE *fp)
 {
         char sbuild_id[BUILD_ID_SIZE * 2 + 1];
-        struct rb_node *nd;
-        size_t ret;
 
         build_id__sprintf(self->build_id, sizeof(self->build_id), sbuild_id);
-        ret = fprintf(fp, "dso: %s (%s)\n", self->short_name, sbuild_id);
+        return fprintf(fp, "%s", sbuild_id);
+}
+
+size_t dso__fprintf(struct dso *self, FILE *fp)
+{
+        struct rb_node *nd;
+        size_t ret = fprintf(fp, "dso: %s (", self->short_name);
+
+        ret += dso__fprintf_buildid(self, fp);
+        ret += fprintf(fp, ")\n");
 
         for (nd = rb_first(&self->syms); nd; nd = rb_next(nd)) {
                 struct symbol *pos = rb_entry(nd, struct symbol, rb_node);
@@ -1428,6 +1435,21 @@ void dsos__fprintf(FILE *fp)
                 dso__fprintf(pos, fp);
 }
 
+size_t dsos__fprintf_buildid(FILE *fp)
+{
+        struct dso *pos;
+        size_t ret = 0;
+
+        list_for_each_entry(pos, &dsos, node) {
+                ret += dso__fprintf_buildid(pos, fp);
+                if (verbose)
+                        ret += fprintf(fp, " %s\n", pos->long_name);
+                else
+                        ret += fprintf(fp, "\n");
+        }
+        return ret;
+}
+
 int load_kernel(symbol_filter_t filter)
 {
         if (dsos__load_kernel(vmlinux_name, filter, modules) <= 0)
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 0a34a5493f1b..51c5a4a08133 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -80,7 +80,9 @@ int dsos__load_kernel(const char *vmlinux, symbol_filter_t filter, int modules);
 struct dso *dsos__findnew(const char *name);
 int dso__load(struct dso *self, struct map *map, symbol_filter_t filter);
 void dsos__fprintf(FILE *fp);
+size_t dsos__fprintf_buildid(FILE *fp);
 
+size_t dso__fprintf_buildid(struct dso *self, FILE *fp);
 size_t dso__fprintf(struct dso *self, FILE *fp);
 char dso__symtab_origin(const struct dso *self);
 void dso__set_build_id(struct dso *self, void *build_id);