perf tools: Save failed result of get_srcline()

Some dso's lack srcline info, so there's no point to keep trying on
them.  Just save failture status and skip them.

Signed-off-by: Namhyung Kim <[email protected]>
Reviewed-by: Jiri Olsa <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[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 6bfc8aacaf7ca035c83b983656f032623f860ebe..af4c687cc49b54279c95c10ed48fe12843700658 100644 (file)
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -450,6 +450,7 @@ struct dso *dso__new(const char *name)
                dso->rel = 0;
                dso->sorted_by_name = 0;
                dso->has_build_id = 0;
+               dso->has_srcline = 1;
                dso->kernel = DSO_TYPE_USER;
                dso->needs_swap = DSO_SWAP__UNSET;
                INIT_LIST_HEAD(&dso->node);

diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index 72eedd65fc2d238247233d5c28de29e17d02007a..9ac666abbe7ef988f30630c053f9c4e709eb3edb 100644 (file)
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -83,6 +83,7 @@ struct dso {
        enum dso_binary_type    data_type;
        u8               adjust_symbols:1;
        u8               has_build_id:1;
+       u8               has_srcline:1;
        u8               hit:1;
        u8               annotate_warned:1;
        u8               sname_alloc:1;

diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index c736d9428cf2d2156c285dab44b26db2ea1fa014..dcff10bed7da47478b5397375387bd18d955fe6a 100644 (file)
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -58,10 +58,13 @@ char *get_srcline(struct dso *dso, unsigned long addr)
 {
        char *file;
        unsigned line;
-       char *srcline = SRCLINE_UNKNOWN;
+       char *srcline;
        char *dso_name = dso->long_name;
        size_t size;
 
+       if (!dso->has_srcline)
+               return SRCLINE_UNKNOWN;
+
        if (dso_name[0] == '[')
                goto out;
 
@@ -81,8 +84,11 @@ char *get_srcline(struct dso *dso, unsigned long addr)
                srcline = SRCLINE_UNKNOWN;
 
        free(file);
-out:
        return srcline;
+
+out:
+       dso->has_srcline = 0;
+       return SRCLINE_UNKNOWN;
 }
 
 void free_srcline(char *srcline)