kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* vm_dump.c (backtrace): on darwin use custom backtrace() to trace

Browse source 
beyond _sigtramp. darwin's backtrace can't trace beyond signal
  trampoline with sigaltstack.

* configure.in: check execinfo.h on darwin.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-03-18 04:31:59 +00:00
parent f8eaf3c625
commit aa24857f12
3 changed files with 68 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Mar 18 13:29:52 2013 NARUSE, Yui <naruse@ruby-lang.org>
* vm_dump.c (backtrace): on darwin use custom backtrace() to trace
beyond _sigtramp. darwin's backtrace can't trace beyond signal
trampoline with sigaltstack.
* configure.in: check execinfo.h on darwin.
Mon Mar 18 11:03:23 2013 NARUSE, Yui <naruse@ruby-lang.org> Mon Mar 18 11:03:23 2013 NARUSE, Yui <naruse@ruby-lang.org>
* vm_exec.h (END_INSN): revert r39517 because the segv seems fixed by * vm_exec.h (END_INSN): revert r39517 because the segv seems fixed by

5
configure.in
View file

@ -2460,6 +2460,11 @@ AC_ARG_WITH(opt-dir,
]) ])
AS_CASE(["$target_cpu-$target_os"], AS_CASE(["$target_cpu-$target_os"],
[*-darwin*], [
AC_CHECK_HEADERS([execinfo.h])
if test "x$ac_cv_header_execinfo_h" = xyes; then
AC_CHECK_LIB([execinfo], [backtrace])
fi],
[*-freebsd*|x86_64-netbsd*], [ [*-freebsd*|x86_64-netbsd*], [
AC_CHECK_HEADERS([execinfo.h]) AC_CHECK_HEADERS([execinfo.h])
if test "x$ac_cv_header_execinfo_h" = xyes; then if test "x$ac_cv_header_execinfo_h" = xyes; then

55
vm_dump.c
View file

@ -428,6 +428,61 @@ rb_vmdebug_thread_dump_state(VALUE self)
# if HAVE_LIBUNWIND # if HAVE_LIBUNWIND
# undef backtrace # undef backtrace
# define backtrace unw_backtrace # define backtrace unw_backtrace
# elif defined(__APPLE__) && defined(__x86_64__)
# define UNW_LOCAL_ONLY
# include <libunwind.h>
# undef backtrace
int backtrace (void **trace, int size) {
unw_cursor_t cursor; unw_context_t uc;
unw_word_t ip;
int n = 0;
unw_getcontext(&uc);
unw_init_local(&cursor, &uc);
while (unw_step(&cursor) > 0) {
unw_get_reg(&cursor, UNW_REG_IP, &ip);
trace[n++] = (void *)ip;
{
char buf[256];
unw_get_proc_name(&cursor, buf, 256, &ip);
if (strncmp("_sigtramp", buf, sizeof("_sigtramp")) == 0) {
goto darwin_sigtramp;
}
}
}
return n;
darwin_sigtramp:
{
ucontext_t *uctx;
unw_get_reg(&cursor, UNW_X86_64_RBX, &ip);
uctx = (ucontext_t *)ip;
unw_set_reg(&cursor, UNW_X86_64_RAX, uctx->uc_mcontext->__ss.__rax);
unw_set_reg(&cursor, UNW_X86_64_RBX, uctx->uc_mcontext->__ss.__rbx);
unw_set_reg(&cursor, UNW_X86_64_RCX, uctx->uc_mcontext->__ss.__rcx);
unw_set_reg(&cursor, UNW_X86_64_RDX, uctx->uc_mcontext->__ss.__rdx);
unw_set_reg(&cursor, UNW_X86_64_RDI, uctx->uc_mcontext->__ss.__rdi);
unw_set_reg(&cursor, UNW_X86_64_RSI, uctx->uc_mcontext->__ss.__rsi);
unw_set_reg(&cursor, UNW_X86_64_RBP, uctx->uc_mcontext->__ss.__rbp);
unw_set_reg(&cursor, UNW_X86_64_RSP, 8+(uctx->uc_mcontext->__ss.__rsp));
unw_set_reg(&cursor, UNW_X86_64_R8, uctx->uc_mcontext->__ss.__r8);
unw_set_reg(&cursor, UNW_X86_64_R9, uctx->uc_mcontext->__ss.__r9);
unw_set_reg(&cursor, UNW_X86_64_R10, uctx->uc_mcontext->__ss.__r10);
unw_set_reg(&cursor, UNW_X86_64_R11, uctx->uc_mcontext->__ss.__r11);
unw_set_reg(&cursor, UNW_X86_64_R12, uctx->uc_mcontext->__ss.__r12);
unw_set_reg(&cursor, UNW_X86_64_R13, uctx->uc_mcontext->__ss.__r13);
unw_set_reg(&cursor, UNW_X86_64_R14, uctx->uc_mcontext->__ss.__r14);
unw_set_reg(&cursor, UNW_X86_64_R15, uctx->uc_mcontext->__ss.__r15);
ip = *(unw_word_t*)uctx->uc_mcontext->__ss.__rsp;
unw_set_reg(&cursor, UNW_REG_IP, ip);
trace[n++] = (void *)(unw_word_t)uctx->uc_mcontext->__ss.__rip;
trace[n++] = (void *)ip;
}
while (unw_step(&cursor) > 0) {
unw_get_reg(&cursor, UNW_REG_IP, &ip);
trace[n++] = (void *)ip;
}
return n;
}
# elif defined(BROKEN_BACKTRACE) # elif defined(BROKEN_BACKTRACE)
# undef HAVE_BACKTRACE # undef HAVE_BACKTRACE
# define HAVE_BACKTRACE 0 # define HAVE_BACKTRACE 0