From 2e47a521e655b20645fa0898fabd2851fe1d8e97 Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 24 Mar 2014 06:28:32 +0000 Subject: * addr2line.c (rb_dump_backtrace_with_lines): fetch path of the executable from /proc/self/exe on Linux. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45394 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ addr2line.c | 28 +++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index da34a87d17..a9e6b7404e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 24 15:19:47 2014 NARUSE, Yui + + * addr2line.c (rb_dump_backtrace_with_lines): fetch path of the + executable from /proc/self/exe on Linux. + Mon Mar 24 14:14:37 2014 SHIBATA Hiroshi * gc.c: Fix up default GC params by @csfrancis [fix GH-556] diff --git a/addr2line.c b/addr2line.c index 1dabfac785..854dbc62ab 100644 --- a/addr2line.c +++ b/addr2line.c @@ -618,13 +618,39 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces, char **syms) line_info_t *lines = (line_info_t *)calloc(num_traces, sizeof(line_info_t)); #ifdef HAVE_DLADDR +# ifdef __linux__ +# define PROC_SELF_EXE "/proc/self/exe" + intptr_t main_fbase; + char *main_path; + { + Dl_info info; + dladdr(rb_dump_backtrace_with_lines, &info); + main_fbase = (intptr_t)info.dli_fbase; + } + { + ssize_t len = readlink(PROC_SELF_EXE, binary_filename, PATH_MAX); + main_path = (char *)alloca(len + 1); + if (!main_path) return; + strncpy(main_path, binary_filename, len); + main_path[len] = 0; + } +# endif /* get object name in which the symbol is */ for (i = 0; i < num_traces; i++) { Dl_info info; if (dladdr(traces[i], &info)) { - lines[i].path = info.dli_fname; /* this may set base addr even if executable is not shared object file */ lines[i].base_addr = (intptr_t)info.dli_fbase; +# ifdef __linux__ + if (lines[i].base_addr == main_fbase) { + lines[i].path = main_path; + } + else { + lines[i].path = info.dli_fname; + } +# else + lines[i].path = info.dli_fname; +# endif lines[i].line = 0; if (info.dli_saddr) { lines[i].sname = info.dli_sname; -- cgit v1.2.3