summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--thread.c19
2 files changed, 10 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index d24cc23df31..b8bf4e293d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 27 12:02:25 2012 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c (rb_thread_terminate_all): broadcast terminate event
+ not only an interrupt exception but any exceptions.
+
Tue Nov 27 10:55:09 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* eval.c (ruby_cleanup): set thread status to THREAD_KILLED
diff --git a/thread.c b/thread.c
index c9471717e0f..33d649b389f 100644
--- a/thread.c
+++ b/thread.c
@@ -378,28 +378,19 @@ rb_thread_terminate_all(void)
/* unlock all locking mutexes */
rb_threadptr_unlock_all_locking_mutexes(th);
-
vm->inhibit_thread_creation = 1;
- retry:
- thread_debug("rb_thread_terminate_all (main thread: %p)\n", (void *)th);
- st_foreach(vm->living_threads, terminate_i, (st_data_t)th);
-
while (!rb_thread_alone()) {
int state;
+ thread_debug("rb_thread_terminate_all (main thread: %p)\n", (void *)th);
+ st_foreach(vm->living_threads, terminate_i, (st_data_t)th);
- PUSH_TAG();
- if ((state = EXEC_TAG()) == 0) {
- th = GET_THREAD();
+ TH_PUSH_TAG(th);
+ if ((state = TH_EXEC_TAG()) == 0) {
native_sleep(th, 0);
RUBY_VM_CHECK_INTS_BLOCKING(th);
}
- POP_TAG();
-
- /* broadcast eTerminateSignal again if Ctrl-C was pressed. */
- if (state && rb_obj_is_kind_of(GET_THREAD()->errinfo, rb_eInterrupt)) {
- goto retry;
- }
+ TH_POP_TAG();
}
}