perf tools: Do not try to call addr2line on non-binary files

No need to call addr2line since they don't have such information.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: Jiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1378876173-13363-6-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index b7e0ef0445dea01db5ac1522d0da140e256a0fe9..d4435939c774748532d2ea4afe20c87f3d81b31e 100644 (file)
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -259,9 +259,6 @@ static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf,
        if (!self->ms.map)
                goto out_ip;
 
-       if (!strncmp(self->ms.map->dso->long_name, "/tmp/perf-", 10))
-               goto out_ip;
-
        path = get_srcline(self->ms.map->dso->long_name, self->ip);
        self->srcline = path;
 

diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index 7e92cca6f5022623f11030a6dbbf29aa261ef396..777f91880cdb1ffac3a789a98e55ca5988d4782e 100644 (file)
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -57,11 +57,17 @@ char *get_srcline(const char *dso_name, unsigned long addr)
 {
        char *file;
        unsigned line;
-       char *srcline;
+       char *srcline = SRCLINE_UNKNOWN;
        size_t size;
 
+       if (dso_name[0] == '[')
+               goto out;
+
+       if (!strncmp(dso_name, "/tmp/perf-", 10))
+               goto out;
+
        if (!addr2line(dso_name, addr, &file, &line))
-               return SRCLINE_UNKNOWN;
+               goto out;
 
        /* just calculate actual length */
        size = snprintf(NULL, 0, "%s:%u", file, line) + 1;
@@ -73,6 +79,7 @@ char *get_srcline(const char *dso_name, unsigned long addr)
                srcline = SRCLINE_UNKNOWN;
 
        free(file);
+out:
        return srcline;
 }