diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-28 13:56:32 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-28 13:56:32 +0000 |
commit | 97cfd1869c2618ec52aa23397ded36df2a9a5d78 (patch) | |
tree | ef4e7a6a7ea1ef6443945dfa553ab9b55f989ec6 /thread.c | |
parent | e76a19ece3f455a47e839c924aa0e89d87a06135 (diff) |
* thread. (rb_thread_terminate_all): revert r24591 which caused SEGV
sometimes. [ruby-dev:40936] [ruby-core:27245] [ruby-core:27416]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -341,8 +341,6 @@ rb_thread_terminate_all(void) { rb_thread_t *th = GET_THREAD(); /* main thread */ rb_vm_t *vm = th->vm; - VALUE einfo = vm->main_thread->errinfo; - int state; if (vm->main_thread != th) { rb_bug("rb_thread_terminate_all: called by child thread (%p, %p)", @@ -359,14 +357,13 @@ rb_thread_terminate_all(void) while (!rb_thread_alone()) { PUSH_TAG(); - if ((state = EXEC_TAG()) == 0) { + if (EXEC_TAG() == 0) { rb_thread_schedule(); } - POP_TAG(); - if (state && einfo != vm->main_thread->errinfo && - RUBY_VM_SET_INTERRUPT(vm->main_thread)) { - break; + else { + /* ignore exception */ } + POP_TAG(); } rb_thread_stop_timer_thread(); } |