diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-03-25 16:58:45 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-03-25 16:58:45 +0000 |
| commit | c1b81d35782225a12ac49ff42aeeb5a9982772b1 (patch) | |
| tree | d6a982a819b5557c7e0d3f7e7b781b3ce36e1f2e | |
| parent | cd2afc30fdf10cd5da6b3814a8d07843ecdbc324 (diff) | |
| download | ruby-c1b81d35782225a12ac49ff42aeeb5a9982772b1.tar.gz | |
* addr2line.c (rb_dump_backtrace_with_lines): a function to get must
be a function in the main executable, whose absolute path is not
available by dladdr, and ruby get it by /proc/self/exe on Linux.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | addr2line.c | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Mar 26 01:55:45 2014 NARUSE, Yui <naruse@ruby-lang.org> + + * addr2line.c (rb_dump_backtrace_with_lines): a function to get must + be a function in the main executable, whose absolute path is not + available by dladdr, and ruby get it by /proc/self/exe on Linux. + Wed Mar 26 01:34:50 2014 NARUSE, Yui <naruse@ruby-lang.org> * addr2line.c (fill_lines): skip if path is NULL. diff --git a/addr2line.c b/addr2line.c index 0123aff5f9..94adf85b91 100644 --- a/addr2line.c +++ b/addr2line.c @@ -623,8 +623,9 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces, char **syms) intptr_t main_fbase; char *main_path; { + extern int main(int argc, char **argv); /* a function in the main executalbe */ Dl_info info; - dladdr(rb_dump_backtrace_with_lines, &info); + dladdr(main, &info); main_fbase = (intptr_t)info.dli_fbase; } { |