kosaki	2011-09-22 19:45:23 +0900 (Thu, 22 Sep 2011)

  New Revision: 33310

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33310

  Log:
    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.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/thread_pthread.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 33309)
+++ ruby_1_9_3/ChangeLog	(revision 33310)
@@ -1,3 +1,12 @@
+Thu Sep 22 19:45:22 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* 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@r...>
 
 	* test/io/wait/test_io_wait.rb (TestIOWait#setup): of course, the
Index: ruby_1_9_3/thread_pthread.c
===================================================================
--- ruby_1_9_3/thread_pthread.c	(revision 33309)
+++ ruby_1_9_3/thread_pthread.c	(revision 33310)
@@ -1013,6 +1013,7 @@
 {
     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);
 }
 
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 33309)
+++ ruby_1_9_3/version.h	(revision 33310)
@@ -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"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/