* thread.c (rb_thread_terminate_all): retry broadcast only when

  an exception is raised.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b8bf4e293d..8c76752ac4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 27 12:17:11 2012  Koichi Sasada  <[email protected]>
+
+	* thread.c (rb_thread_terminate_all): retry broadcast only when
+	  an exception is raised.
+
 Tue Nov 27 12:02:25 2012  Koichi Sasada  <[email protected]>
 
 	* thread.c (rb_thread_terminate_all): broadcast terminate event
diff --git a/thread.c b/thread.c
index 33d649b389..a0a3472b26 100644
--- a/thread.c
+++ b/thread.c
@@ -380,10 +380,12 @@ rb_thread_terminate_all(void)
 
     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);
 
 	TH_PUSH_TAG(th);
 	if ((state = TH_EXEC_TAG()) == 0) {
@@ -391,6 +393,10 @@ rb_thread_terminate_all(void)
 	    RUBY_VM_CHECK_INTS_BLOCKING(th);
 	}
 	TH_POP_TAG();
+
+	if (state) {
+	    goto retry;
+	}
     }
 }