perf symbols: Kill struct build_id_list and die() another day

No need for this struct and its allocations, we can just use the
->build_id member we already have in struct dso, then ask for it
to be read, and later traverse the dsos list, writing the
buildid table to the perf.data file.

As a bonus, one more die() function got killed.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1258582853-8579-2-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 9 insertions, 28 deletions

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 594f36a1da8f..946ec319568b 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -883,38 +883,19 @@ out_close:
         return err;
 }
 
-bool fetch_build_id_table(struct list_head *head)
+bool dsos__read_build_ids(void)
 {
-        bool have_buildid = false;
+        bool have_build_id = false;
         struct dso *pos;
 
-        list_for_each_entry(pos, &dsos, node) {
-                struct build_id_list *new;
-                struct build_id_event b;
-                size_t len;
-
-                if (filename__read_build_id(pos->long_name,
-                                            &b.build_id,
-                                            sizeof(b.build_id)) < 0)
-                        continue;
-                have_buildid = true;
-                memset(&b.header, 0, sizeof(b.header));
-                len = pos->long_name_len + 1;
-                len = ALIGN(len, 64);
-                b.header.size = sizeof(b) + len;
-
-                new = malloc(sizeof(*new));
-                if (!new)
-                        die("No memory\n");
-
-                memcpy(&new->event, &b, sizeof(b));
-                new->dso_name = pos->long_name;
-                new->len = len;
-
-                list_add_tail(&new->list, head);
-        }
+        list_for_each_entry(pos, &dsos, node)
+                if (filename__read_build_id(pos->long_name, pos->build_id,
+                                            sizeof(pos->build_id)) > 0) {
+                        have_build_id     = true;
+                        pos->has_build_id = true;
+                }
 
-        return have_buildid;
+        return have_build_id;
 }
 
 int filename__read_build_id(const char *filename, void *bf, size_t size)