From f5b0b984b3484149386fb352c3090390f8e3553a Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 17 Oct 2018 08:40:36 +0000 Subject: merge revision(s) 63711,64398: [Backport #14841] thread_sync.c (rb_mutex_lock): fix deadlock * thread_sync.c (rb_mutex_lock): fix deadlock [ruby-core:87467] [Bug #14841] 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@65115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread_sync.c | 6 +++++- version.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/thread_sync.c b/thread_sync.c index 152995fac0..297b440a49 100644 --- a/thread_sync.c +++ b/thread_sync.c @@ -299,7 +299,11 @@ rb_mutex_lock(VALUE self) if (mutex->th == th) mutex_locked(th, self); if (interrupted) { - RUBY_VM_CHECK_INTS_BLOCKING(th); + RUBY_VM_CHECK_INTS_BLOCKING(th); /* may release mutex */ + if (!mutex->th) { + mutex->th = th; + mutex_locked(th, self); + } } } } diff --git a/version.h b/version.h index 8c7590f6f7..bc6c7df75c 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.5" #define RUBY_RELEASE_DATE "2018-10-17" -#define RUBY_PATCHLEVEL 329 +#define RUBY_PATCHLEVEL 330 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.3