kosaki	2011-05-07 15:20:39 +0900 (Sat, 07 May 2011)

  New Revision: 31460

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

  Log:
    fix incorrect native_cond_signal call when deadlock was detected.
    
    * thread.c (lock_func): timedwait don't touch cond_waiting and
      cond_notifid variables.

  Modified files:
    trunk/ChangeLog
    trunk/thread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31459)
+++ ChangeLog	(revision 31460)
@@ -1,3 +1,9 @@
+Sat May  7 15:18:06 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+	fix incorrect native_cond_signal call when deadlock was detected.
+
+	* thread.c (lock_func): timedwait don't touch cond_waiting and
+	  cond_notifid variables.
+
 Sat May  7 15:15:10 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	fix win32 native_cond_timedwait() makes SIGSEGV.
Index: thread.c
===================================================================
--- thread.c	(revision 31459)
+++ thread.c	(revision 31460)
@@ -3423,7 +3423,6 @@
 	    break;
 	}
 
-	mutex->cond_waiting++;
 	if (timeout_ms) {
 	    int ret;
 	    struct timespec timeout_rel;
@@ -3439,9 +3438,10 @@
 	    }
 	}
 	else {
+	    mutex->cond_waiting++;
 	    native_cond_wait(&mutex->cond, &mutex->lock);
+	    mutex->cond_notified--;
 	}
-	mutex->cond_notified--;
 
 	if (RUBY_VM_INTERRUPTED(th)) {
 	    interrupted = 1;

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