ko1	2012-11-28 23:40:00 +0900 (Wed, 28 Nov 2012)

  New Revision: 37943

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

  Log:
    * thread.c (rb_mutex_sleep): fix to allow spurious wakeup.
    * NEWS: write about spurious wakeup.

  Modified files:
    trunk/ChangeLog
    trunk/NEWS
    trunk/thread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37942)
+++ ChangeLog	(revision 37943)
@@ -1,3 +1,9 @@
+Wed Nov 28 23:39:01 2012  Koichi Sasada  <ko1@a...>
+
+	* thread.c (rb_mutex_sleep): fix to allow spurious wakeup.
+
+	* NEWS: write about spurious wakeup.
+
 Wed Nov 28 23:37:14 2012  Masaya Tarui  <tarui@r...>
 
 	* NEWS (Thread) remove incompatible changes.
Index: thread.c
===================================================================
--- thread.c	(revision 37942)
+++ thread.c	(revision 37943)
@@ -4294,15 +4294,15 @@
 static VALUE
 rb_mutex_sleep_forever(VALUE time)
 {
-    rb_thread_sleep_deadly();
+    sleep_forever(GET_THREAD(), 1, 0); /* permit spurious check */
     return Qnil;
 }
 
 static VALUE
 rb_mutex_wait_for(VALUE time)
 {
-    const struct timeval *t = (struct timeval *)time;
-    rb_thread_wait_for(*t);
+    struct timeval *t = (struct timeval *)time;
+    sleep_timeval(GET_THREAD(), *t, 0); /* permit spurious check */
     return Qnil;
 }
 
@@ -4334,6 +4334,9 @@
  * Releases the lock and sleeps +timeout+ seconds if it is given and
  * non-nil or forever.  Raises +ThreadError+ if +mutex+ wasn't locked by
  * the current thread.
+ *
+ * Note that this method can wakeup without explicit Thread#wakeup call.
+ * For example, receiving signal and so on.
  */
 static VALUE
 mutex_sleep(int argc, VALUE *argv, VALUE self)
Index: NEWS
===================================================================
--- NEWS	(revision 37942)
+++ NEWS	(revision 37943)
@@ -116,6 +116,7 @@
       * Mutex#lock, Mutex#unlock, Mutex#try_lock, Mutex#synchronize
         and Mutex#sleep are no longer allowed to be used from trap handler
         and raise a ThreadError in such case.
+      * Mutex#sleep may spurious wakeup. Check after wakeup.
 
   * NilClass
     * added method:

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