normal	2018-08-17 04:59:21 +0900 (Fri, 17 Aug 2018)

  New Revision: 64398

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64398

  Log:
    thread_sync.c (rb_mutex_lock): acquire lock before being killed
    
    We (the thread acquiring the mutex) need to acquire the mutex
    before being killed to work with ConditionVariable#wait.
    
    Thus we reinstate the acquire-immediately-after-sleeping logic
    from pre-r63711 while still retaining the
    acquire-after-checking-for-interrupts logic from r63711.
    
    This regression was introduced in
    commit 501069b8a4013f2e3fdde35c50e9527ef0061963 (r63711)
    ("thread_sync.c (rb_mutex_lock): fix deadlock") for
    [Bug #14841]
    
    [ruby-core:88503] [Bug #14999] [Bug #14841]

  Modified files:
    trunk/thread_sync.c
Index: thread_sync.c
===================================================================
--- thread_sync.c	(revision 64397)
+++ thread_sync.c	(revision 64398)
@@ -272,17 +272,23 @@ rb_mutex_lock(VALUE self) https://github.com/ruby/ruby/blob/trunk/thread_sync.c#L272
 	    list_add_tail(&mutex->waitq, &w.node);
 	    native_sleep(th, timeout); /* release GVL */
 	    list_del(&w.node);
+
+	    if (!mutex->th) {
+		mutex->th = th;
+	    }
+
 	    if (patrol_thread == th)
 		patrol_thread = NULL;
 
 	    th->locking_mutex = Qfalse;
-	    if (timeout && !RUBY_VM_INTERRUPTED(th->ec)) {
+	    if (mutex->th && timeout && !RUBY_VM_INTERRUPTED(th->ec)) {
 		rb_check_deadlock(th->vm);
 	    }
 	    if (th->status == THREAD_STOPPED_FOREVER) {
 		th->status = prev_status;
 	    }
 	    th->vm->sleeper--;
+	    if (mutex->th == th) mutex_locked(th, self);
 
 	    RUBY_VM_CHECK_INTS_BLOCKING(th->ec); /* may release mutex */
 	    if (!mutex->th) {

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