nagachika	2011-06-25 23:28:56 +0900 (Sat, 25 Jun 2011)

  New Revision: 32226

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

  Log:
    * thread.c (sleep_forever): now Kernel#sleep don't wakeup by
      signal handler execution. [Bug #4072]

  Modified files:
    trunk/ChangeLog
    trunk/thread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32225)
+++ ChangeLog	(revision 32226)
@@ -1,3 +1,8 @@
+Sat Jun 25 23:23:14 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* thread.c (sleep_forever): now Kernel#sleep don't wakeup by
+	  signal handler execution. [Bug #4072]
+
 Sat Jun 25 23:14:47 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
 
 	* thread.c (rb_threadptr_check_signal): remove unnecessary th->status
Index: thread.c
===================================================================
--- thread.c	(revision 32225)
+++ thread.c	(revision 32226)
@@ -834,8 +834,9 @@
 sleep_forever(rb_thread_t *th, int deadlockable)
 {
     enum rb_thread_status prev_status = th->status;
+    enum rb_thread_status status = deadlockable ? THREAD_STOPPED_FOREVER : THREAD_STOPPED;
 
-    th->status = deadlockable ? THREAD_STOPPED_FOREVER : THREAD_STOPPED;
+    th->status = status;
     do {
 	if (deadlockable) {
 	    th->vm->sleeper++;
@@ -846,7 +847,7 @@
 	    th->vm->sleeper--;
 	}
 	RUBY_VM_CHECK_INTS();
-    } while (th->status == THREAD_STOPPED_FOREVER);
+    } while (th->status == status);
     th->status = prev_status;
 }
 

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