1 files changed, 22 insertions, 4 deletions

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 804e02382739..c1c556825343 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,8 @@ 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)
 {
         struct map *self = malloc(sizeof(*self));
 
@@ -27,6 +29,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,14 +52,29 @@ 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);
+
+                        if (nr < 0)
+                                pr_warning("Failed to open %s, continuing "
+                                           "without symbols\n",
+                                           self->dso->long_name);
+                        else if (nr == 0)
+                                pr_warning("No symbols found in %s, maybe "
+                                           "install a debug package?\n",
+                                           self->dso->long_name);
+                }
+
                 if (self->dso == vdso || anon)
-                        self->map_ip = vdso__map_ip;
-                else
+                        self->map_ip = self->unmap_ip = identity__map_ip;
+                else {
                         self->map_ip = map__map_ip;
+                        self->unmap_ip = map__unmap_ip;
+                }
         }
         return self;
 out_delete: