perf annotate: Use the sym_priv_size area for the histogram

We have this sym_priv_size mechanism for attaching private areas
to struct symbol entries but annotate wasn't using it, adding
private areas to struct symbol in addition to a ->priv pointer.

Scrap all that and use the sym_priv_size mechanism.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1256055940-19511-1-git-send-email-acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 19 insertions, 2 deletions

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 4e203d144f9e..55079c0200e0 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include "debug.h"
 
 static inline int is_anon_memory(const char *filename)
 {
@@ -19,7 +20,9 @@ static int strcommon(const char *pathname, char *cwd, int cwdlen)
         return n;
 }
 
- struct map *map__new(struct mmap_event *event, char *cwd, int cwdlen)
+struct map *map__new(struct mmap_event *event, char *cwd, int cwdlen,
+                     unsigned int sym_priv_size, symbol_filter_t filter,
+                     int v)
 {
         struct map *self = malloc(sizeof(*self));
 
@@ -27,6 +30,7 @@ static int strcommon(const char *pathname, char *cwd, int cwdlen)
                 const char *filename = event->filename;
                 char newfilename[PATH_MAX];
                 int anon;
+                bool new_dso;
 
                 if (cwd) {
                         int n = strcommon(filename, cwd, cwdlen);
@@ -49,10 +53,23 @@ static int strcommon(const char *pathname, char *cwd, int cwdlen)
                 self->end   = event->start + event->len;
                 self->pgoff = event->pgoff;
 
-                self->dso = dsos__findnew(filename);
+                self->dso = dsos__findnew(filename, sym_priv_size, &new_dso);
                 if (self->dso == NULL)
                         goto out_delete;
 
+                if (new_dso) {
+                        int nr = dso__load(self->dso, self, filter, v);
+
+                        if (nr < 0)
+                                eprintf("Failed to open %s, continuing "
+                                        "without symbols\n",
+                                        self->dso->long_name);
+                        else if (nr == 0)
+                                eprintf("No symbols found in %s, maybe "
+                                        "install a debug package?\n",
+                                        self->dso->long_name);
+                }
+
                 if (self->dso == vdso || anon)
                         self->map_ip = self->unmap_ip = identity__map_ip;
                 else {