summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--thread_pthread.c1
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b7af797b1c..2963027f39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Sep 22 01:52:48 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:55:26 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* test/io/wait/test_io_wait.rb (TestIOWait#setup): of course, the
diff --git a/thread_pthread.c b/thread_pthread.c
index 6d700051a8..afc86ca035 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -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);
}