diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-11 14:40:04 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-11 14:40:04 +0000 |
| commit | c561f04beb2e227d03e91534b6ed38a8ee540b91 (patch) | |
| tree | 191390a0391ab5dcca37b877df047431558fbbc2 | |
| parent | c1034574aa7e6f47843b5533411c75d8196b29d8 (diff) | |
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_5@64998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | thread_sync.c | 8 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/thread_sync.c b/thread_sync.c index ef0bbf3af3..bd51328e52 100644 --- a/thread_sync.c +++ b/thread_sync.c @@ -272,6 +272,7 @@ 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; } @@ -287,10 +288,13 @@ rb_mutex_lock(VALUE self) th->status = prev_status; } 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; @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.5.2" #define RUBY_RELEASE_DATE "2018-10-11" -#define RUBY_PATCHLEVEL 98 +#define RUBY_PATCHLEVEL 99 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 10 |