perf tools: Delay loading symtabs till we hit a map with it

So that we can have a quicker start on perf top and even
speedups in the other tools, as we can have maps with no hits,
so no need to load its symtabs.

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: <1256773881-4191-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 22 insertions, 16 deletions

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index c1c556825343..d302e513e062 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -21,7 +21,7 @@ static int strcommon(const char *pathname, 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)
+                     unsigned int sym_priv_size)
 {
         struct map *self = malloc(sizeof(*self));
 
@@ -29,7 +29,6 @@ struct map *map__new(struct mmap_event *event, 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);
@@ -52,23 +51,10 @@ struct map *map__new(struct mmap_event *event, char *cwd, int cwdlen,
                 self->end   = event->start + event->len;
                 self->pgoff = event->pgoff;
 
-                self->dso = dsos__findnew(filename, sym_priv_size, &new_dso);
+                self->dso = dsos__findnew(filename, sym_priv_size);
                 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 = self->unmap_ip = identity__map_ip;
                 else {
@@ -82,6 +68,26 @@ out_delete:
         return NULL;
 }
 
+struct symbol *
+map__find_symbol(struct map *self, u64 ip, symbol_filter_t filter)
+{
+        if (!self->dso->loaded) {
+                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);
+                        return NULL;
+                } else if (nr == 0) {
+                        pr_warning("No symbols found in %s, maybe install a debug package?\n",
+                                   self->dso->long_name);
+                        return NULL;
+                }
+        }
+
+        return self->dso->find_symbol(self->dso, ip);
+}
+
 struct map *map__clone(struct map *self)
 {
         struct map *map = malloc(sizeof(*self));