perf symbols: Retain symbol source file name to lookup source line numbers

Currently, lookup of an ip's source file name and line number is done
using the dso file name.

Instead retain the file name used to lookup the dso's symbols and use
that.

Signed-off-by: Adrian Hunter <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 68aa55aa5c171d70187459c9485053a1821e527f..49da9684f63595bcfc892f80c59df08c29ea3d36 100644 (file)
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -470,6 +470,7 @@ void dso__delete(struct dso *dso)
                free(dso->long_name);
        dso_cache__free(&dso->cache);
        dso__free_a2l(dso);
+       free(dso->symsrc_filename);
        free(dso);
 }
 

diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index d8613dc3ca8f1a70a10fa361f2d1a14e7a42fd08..7142e526126605964fbd4359cf7e9fcbf21b6512 100644 (file)
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -78,6 +78,7 @@ struct dso {
        struct rb_root   symbol_names[MAP__NR_TYPES];
        struct rb_root   cache;
        void             *a2l;
+       char             *symsrc_filename;
        enum dso_kernel_type    kernel;
        enum dso_swap_type      needs_swap;
        enum dso_binary_type    symtab_type;

diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index 25b85b28301b4a1b3fd9405187948cf3cd70087a..93795f9c24806069eea5b0c9ec11d2273475b65b 100644 (file)
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -249,11 +249,16 @@ char *get_srcline(struct dso *dso, unsigned long addr)
        char *file = NULL;
        unsigned line = 0;
        char *srcline;
-       char *dso_name = dso->long_name;
+       char *dso_name;
 
        if (!dso->has_srcline)
                return SRCLINE_UNKNOWN;
 
+       if (dso->symsrc_filename)
+               dso_name = dso->symsrc_filename;
+       else
+               dso_name = dso->long_name;
+
        if (dso_name[0] == '[')
                goto out;
 

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 360eefecb81df4de3d458085ba6cbc05dce0f0d4..de87dbac50a0d42513209e6aaa5c56fa2a2471fa 100644 (file)
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1336,6 +1336,8 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
                if (!syms_ss && symsrc__has_symtab(ss)) {
                        syms_ss = ss;
                        next_slot = true;
+                       if (!dso->symsrc_filename)
+                               dso->symsrc_filename = strdup(name);
                }
 
                if (!runtime_ss && symsrc__possibly_runtime(ss)) {