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

merge revision(s) 33307:

* thread_pthread.c (ubf_select): activate timer thread when interrupt
	  blocking thread.
	  A patch created by Koichi Sasada. [ruby-core:39634] [Bug #5343]
	  to cover race condition, timer thread periodically send SIGVTARLM to
	  threads in signal thread list. so you should activate timer thread
	  when interrupt a thread.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2011-09-22 10:45:23 +00:00
parent df1a46fd4b
commit 010c8e5970
3 changed files with 12 additions and 2 deletions

View file

@ -1,3 +1,12 @@
Thu Sep 22 19:45:22 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* thread_pthread.c (ubf_select): activate timer thread when interrupt
blocking thread.
A patch created by Koichi Sasada. [ruby-core:39634] [Bug #5343]
to cover race condition, timer thread periodically send SIGVTARLM to
threads in signal thread list. so you should activate timer thread
when interrupt a thread.
Wed Sep 21 16:57:03 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* test/io/wait/test_io_wait.rb (TestIOWait#setup): of course, the

View file

@ -1013,6 +1013,7 @@ ubf_select(void *ptr)
{
rb_thread_t *th = (rb_thread_t *)ptr;
add_signal_thread_list(th);
rb_thread_wakeup_timer_thread(); /* activate timer thread */
ubf_select_each(th);
}

View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL -1
#define RUBY_RELEASE_DATE "2011-09-21"
#define RUBY_RELEASE_DATE "2011-09-22"
#define RUBY_RELEASE_YEAR 2011
#define RUBY_RELEASE_MONTH 9
#define RUBY_RELEASE_DAY 21
#define RUBY_RELEASE_DAY 22
#include "ruby/version.h"