perf callchain: Make get_srcline fall back to sym+offset

When the source line is not found fall back to sym + offset.  This is
generally much more useful than a raw address.

For this we need to pass in the symbol from the caller.

For some callers it's awkward to compute, so we stay at the old
behaviour.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1415844328-4884-10-git-send-email-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index ac877f96fed7..e73b6a5c9e0f 100644
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -8,6 +8,8 @@
 #include "util/util.h"
 #include "util/debug.h"
 
+#include "symbol.h"
+
 #ifdef HAVE_LIBBFD_SUPPORT
 
 /*
@@ -250,7 +252,8 @@ void dso__free_a2l(struct dso *dso __maybe_unused)
  */
 #define A2L_FAIL_LIMIT 123
 
-char *get_srcline(struct dso *dso, unsigned long addr)
+char *get_srcline(struct dso *dso, unsigned long addr, struct symbol *sym,
+                  bool show_sym)
 {
         char *file = NULL;
         unsigned line = 0;
@@ -289,7 +292,11 @@ out:
                 dso->has_srcline = 0;
                 dso__free_a2l(dso);
         }
-        if (asprintf(&srcline, "%s[%lx]", dso->short_name, addr) < 0)
+        if (sym) {
+                if (asprintf(&srcline, "%s+%ld", show_sym ? sym->name : "",
+                                        addr - sym->start) < 0)
+                        return SRCLINE_UNKNOWN;
+        } else if (asprintf(&srcline, "%s[%lx]", dso->short_name, addr) < 0)
                 return SRCLINE_UNKNOWN;
         return srcline;
 }