kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

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

Browse source 
an exception is raised.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2012-11-27 03:18:29 +00:00
parent 2f9ee7af47
commit c72f0daa87
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Nov 27 12:17:11 2012 Koichi Sasada <ko1@atdot.net>
* thread.c (rb_thread_terminate_all): retry broadcast only when
an exception is raised.
Tue Nov 27 12:02:25 2012 Koichi Sasada <ko1@atdot.net>
* thread.c (rb_thread_terminate_all): broadcast terminate event

10
thread.c
View file

@ -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;
}
}
}