diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | thread.c | 12 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Thu Aug 20 08:39:50 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * thread.c (rb_thread_terminate_all): do not ignore interrupt when + reaping threads on termination. [ruby-dev:39107] + Thu Aug 20 01:06:48 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * dir.c (DEFINE_STRUCT_DIRENT): use union to allocate sufficient @@ -298,6 +298,9 @@ 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)", (void *)vm->main_thread, (void *)th); @@ -313,13 +316,14 @@ rb_thread_terminate_all(void) while (!rb_thread_alone()) { PUSH_TAG(); - if (EXEC_TAG() == 0) { + if ((state = EXEC_TAG()) == 0) { rb_thread_schedule(); } - else { - /* ignore exception */ - } POP_TAG(); + if (state && einfo != vm->main_thread->errinfo && + RUBY_VM_SET_INTERRUPT(vm->main_thread)) { + break; + } } rb_thread_stop_timer_thread(); } @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 298 +#define RUBY_PATCHLEVEL 299 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |