summaryrefslogtreecommitdiff
path: root/thread_sync.c
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-06-22 02:32:30 (GMT)
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-06-22 02:32:30 (GMT)
commit501069b8a4013f2e3fdde35c50e9527ef0061963 (patch)
tree9552af5359e6530f8a00a4025ea56a033875f2ad /thread_sync.c
parent0af19735d79535c3ada552b8caaf8c00610b4f88 (diff)
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
Diffstat (limited to 'thread_sync.c')
-rw-r--r--thread_sync.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/thread_sync.c b/thread_sync.c
index e7702f1..b2b7d05 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;