Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ed4915a authored by Rabin Vincent's avatar Rabin Vincent Committed by Arnaldo Carvalho de Melo
Browse files

perf unwind: Pass symbol source to libunwind 



Even if --symfs is used to point to the debug binaries, we send in the
non-debug filenames to libunwind, which leads to libunwind not finding
the debug frame.  Fix this by preferring the file in --symfs, if it is
available.

Signed-off-by: default avatarRabin Vincent <rabin.vincent@axis.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Rabin Vincent <rabinv@axis.com>
Link: http://lkml.kernel.org/r/1446104978-26429-1-git-send-email-rabin.vincent@axis.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3af6ed84

tools/perf/util/unwind-libunwind.c

+4 −1
Original line number Diff line number Diff line
@@ -360,12 +360,15 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi, 
		int fd = dso__data_get_fd(map->dso, ui->machine);

		int is_exec = elf_is_exec(fd, map->dso->name);

		unw_word_t base = is_exec ? 0 : map->start;

		const char *symfile;



		if (fd >= 0)

			dso__data_put_fd(map->dso);



		symfile = map->dso->symsrc_filename ?: map->dso->name;



		memset(&di, 0, sizeof(di));

		if (dwarf_find_debug_frame(0, &di, ip, base, map->dso->name,

		if (dwarf_find_debug_frame(0, &di, ip, base, symfile,

					   map->start, map->end))

			return dwarf_search_unwind_table(as, ip, &di, pi,

							 need_unwind_info, arg);