From 501069b8a4013f2e3fdde35c50e9527ef0061963 Mon Sep 17 00:00:00 2001 From: normal Date: Fri, 22 Jun 2018 02:32:30 +0000 Subject: [PATCH] thread_sync.c (rb_mutex_lock): fix deadlock * thread_sync.c (rb_mutex_lock): fix deadlock [ruby-core:87467] [Bug #14841] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread_sync.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/thread_sync.c b/thread_sync.c index e7702f17d0..b2b7d05088 100644 --- a/thread_sync.c +++ b/thread_sync.c @@ -272,15 +272,11 @@ rb_mutex_lock(VALUE self) 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 (mutex->th && timeout && !RUBY_VM_INTERRUPTED(th->ec)) { + if (timeout && !RUBY_VM_INTERRUPTED(th->ec)) { rb_check_deadlock(th->vm); } if (th->status == THREAD_STOPPED_FOREVER) { @@ -288,9 +284,11 @@ rb_mutex_lock(VALUE self) } th->vm->sleeper--; - if (mutex->th == th) mutex_locked(th, self); - - RUBY_VM_CHECK_INTS_BLOCKING(th->ec); + RUBY_VM_CHECK_INTS_BLOCKING(th->ec); /* may release mutex */ + if (!mutex->th) { + mutex->th = th; + mutex_locked(th, self); + } } } return self;