Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1386055390-13757-6-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Adrian Hunter and committed by
Arnaldo Carvalho de Melo
0058aef6 454ff00f

+10 -1
+1
tools/perf/util/dso.c
··· 470 470 free(dso->long_name); 471 471 dso_cache__free(&dso->cache); 472 472 dso__free_a2l(dso); 473 + free(dso->symsrc_filename); 473 474 free(dso); 474 475 } 475 476
+1
tools/perf/util/dso.h
··· 78 78 struct rb_root symbol_names[MAP__NR_TYPES]; 79 79 struct rb_root cache; 80 80 void *a2l; 81 + char *symsrc_filename; 81 82 enum dso_kernel_type kernel; 82 83 enum dso_swap_type needs_swap; 83 84 enum dso_binary_type symtab_type;
+6 -1
tools/perf/util/srcline.c
··· 249 249 char *file = NULL; 250 250 unsigned line = 0; 251 251 char *srcline; 252 - char *dso_name = dso->long_name; 252 + char *dso_name; 253 253 254 254 if (!dso->has_srcline) 255 255 return SRCLINE_UNKNOWN; 256 + 257 + if (dso->symsrc_filename) 258 + dso_name = dso->symsrc_filename; 259 + else 260 + dso_name = dso->long_name; 256 261 257 262 if (dso_name[0] == '[') 258 263 goto out;
+2
tools/perf/util/symbol.c
··· 1336 1336 if (!syms_ss && symsrc__has_symtab(ss)) { 1337 1337 syms_ss = ss; 1338 1338 next_slot = true; 1339 + if (!dso->symsrc_filename) 1340 + dso->symsrc_filename = strdup(name); 1339 1341 } 1340 1342 1341 1343 if (!runtime_ss && symsrc__possibly_runtime(ss)) {