diff options
| author | Namhyung Kim <[email protected]> | 2013-09-11 05:09:30 +0000 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <[email protected]> | 2013-10-09 19:01:44 +0000 |
| commit | 86c98cab5a3137376ea7df5ffa5bd52e545fee95 (patch) | |
| tree | 35e8a5fe7d0e1df6f1b00d4d9b5eaf63dc38299f /tools/perf/util/annotate.c | |
| parent | perf tools: Do not try to call addr2line on non-binary files (diff) | |
| download | kernel-86c98cab5a3137376ea7df5ffa5bd52e545fee95.tar.gz kernel-86c98cab5a3137376ea7df5ffa5bd52e545fee95.zip | |
perf annotate: Pass dso instead of dso_name to get_srcline()
This is a preparation of next change. No functional changes are
intended.
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]>
Diffstat (limited to 'tools/perf/util/annotate.c')
| -rw-r--r-- | tools/perf/util/annotate.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index d48297d77e19..d73e8008aada 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1081,8 +1081,7 @@ static void symbol__free_source_line(struct symbol *sym, int len) /* Get the filename:line for the colored entries */ static int symbol__get_source_line(struct symbol *sym, struct map *map, struct perf_evsel *evsel, - struct rb_root *root, int len, - const char *filename) + struct rb_root *root, int len) { u64 start; int i, k; @@ -1131,7 +1130,7 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map, goto next; offset = start + i; - src_line->path = get_srcline(filename, offset); + src_line->path = get_srcline(map->dso, offset); insert_source_line(&tmp_root, src_line); next: @@ -1338,7 +1337,6 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, bool full_paths, int min_pcnt, int max_lines) { struct dso *dso = map->dso; - const char *filename = dso->long_name; struct rb_root source_line = RB_ROOT; u64 len; @@ -1348,9 +1346,8 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, len = symbol__size(sym); if (print_lines) { - symbol__get_source_line(sym, map, evsel, &source_line, - len, filename); - print_summary(&source_line, filename); + symbol__get_source_line(sym, map, evsel, &source_line, len); + print_summary(&source_line, dso->long_name); } symbol__annotate_printf(sym, map, evsel, full_paths, |