mirror of
https://github.com/ruby/ruby.git
synced 2025-09-18 18:13:58 +02:00
merges r23720 from trunk into ruby_1_9_1.
-- * 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/branches/ruby_1_9_1@23794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c2d571c37f
commit
341c1cb7f8
3 changed files with 19 additions and 2 deletions
|
@ -1,3 +1,11 @@
|
|||
Wed Jun 17 12:37:37 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* 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:14:01 2009 Tadayoshi Funaba <tadf@dotrb.org>
|
||||
|
||||
* complex.c (nucomp_coerce): accepts Complex instances.
|
||||
|
|
11
thread.c
11
thread.c
|
@ -1302,12 +1302,21 @@ rb_thread_signal_exit(void *thptr)
|
|||
rb_thread_raise(2, argv, th->vm->main_thread);
|
||||
}
|
||||
|
||||
#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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#define RUBY_VERSION "1.9.1"
|
||||
#define RUBY_RELEASE_DATE "2009-05-22"
|
||||
#define RUBY_PATCHLEVEL 184
|
||||
#define RUBY_PATCHLEVEL 185
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
#define RUBY_VERSION_MINOR 9
|
||||
#define RUBY_VERSION_TEENY 1
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue