From 945ea61cd7a6ee0701e7b337bae5a090afca92e1 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 17 Jun 2009 03:56:29 +0000 Subject: [PATCH] * thread.c (ruby_thread_stack_overflow): call rb_exc_raise() on stack overflows in the signal handler, if sigaltstack is available. On stack overflow (and with sigaltstack), the signal handler is more likely to have room to create an exception object. [ruby-core:23813] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ thread.c | 11 ++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 73ee9ff902..389c288a11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Jun 17 12:37:37 2009 Yukihiro Matsumoto + + * thread.c (ruby_thread_stack_overflow): call rb_exc_raise() on + stack overflows in the signal handler, if sigaltstack is + available. On stack overflow (and with sigaltstack), the signal + handler is more likely to have room to create an exception + object. [ruby-core:23813] + Wed Jun 17 08:10:38 2009 Koichi Sasada * ext/objspace: added. objspace library extends some methods to diff --git a/thread.c b/thread.c index efe5d02dd5..63706c9800 100644 --- a/thread.c +++ b/thread.c @@ -1300,12 +1300,21 @@ rb_threadptr_signal_exit(rb_thread_t *th) rb_threadptr_raise(th->vm->main_thread, 2, argv); } +#if defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK) +#define USE_SIGALTSTACK +#endif + void ruby_thread_stack_overflow(rb_thread_t *th) { - th->errinfo = sysstack_error; th->raised_flag = 0; +#ifdef USE_SIGALTSTACK + th->raised_flag = 0; + rb_exc_raise(sysstack_error); +#else + th->errinfo = sysstack_error; TH_JUMP_TAG(th, TAG_RAISE); +#endif } int