perf symbols: Retain symbol source file name to lookup source line numbers (0058aef6) · Commits · 戴 / test

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>

tools/perf/util/dso.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -470,6 +470,7 @@ void dso__delete(struct dso *dso)
		free(dso->long_name);
		dso_cache__free(&dso->cache);
		dso__free_a2l(dso);
		free(dso->symsrc_filename);
		free(dso);
		}

tools/perf/util/dso.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ struct dso {
		struct rb_root symbol_names[MAP__NR_TYPES];
		struct rb_root cache;
		void *a2l;
		char *symsrc_filename;
		enum dso_kernel_type kernel;
		enum dso_swap_type needs_swap;
		enum dso_binary_type symtab_type;

tools/perf/util/srcline.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -249,11 +249,16 @@ char get_srcline(struct dso dso, unsigned long addr)
		char *file = NULL;
		unsigned line = 0;
		char *srcline;
		char *dso_name = dso->long_name;
		char *dso_name;

		if (!dso->has_srcline)
		return SRCLINE_UNKNOWN;

		if (dso->symsrc_filename)
		dso_name = dso->symsrc_filename;
		else
		dso_name = dso->long_name;

		if (dso_name[0] == '[')
		goto out;

tools/perf/util/symbol.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1336,6 +1336,8 @@ int dso__load(struct dso dso, struct map map, symbol_filter_t filter)
		if (!syms_ss && symsrc__has_symtab(ss)) {
		syms_ss = ss;
		next_slot = true;
		if (!dso->symsrc_filename)
		dso->symsrc_filename = strdup(name);
		}

		if (!runtime_ss && symsrc__possibly_runtime(ss)) {

Admin message