aboutsummaryrefslogtreecommitdiffstats
path: root/thread_sync.c
diff options
context:
space:
mode:
Diffstat (limited to 'thread_sync.c')
-rw-r--r--thread_sync.c32
1 files changed, 9 insertions, 23 deletions
diff --git a/thread_sync.c b/thread_sync.c
index 63f0228d9d..85ebec4d8c 100644
--- a/thread_sync.c
+++ b/thread_sync.c
@@ -290,28 +290,6 @@ delete_from_waitq(VALUE value)
return Qnil;
}
-static void
-do_mutex_lock_check_interrupts(int interruptible_p, rb_fiber_t *fiber, rb_mutex_t *mutex, rb_thread_t *thread)
-{
- // We extracted this function because we suspect there can be a codegen bug
- // on ppc64le and moving this code to a separate function seems to fix the
- // problem, at least in my tests.
- if (interruptible_p) {
- /* release mutex before checking for interrupts...as interrupt checking
- * code might call rb_raise() */
- if (mutex->fiber == fiber) {
- mutex->fiber = 0;
- }
-
- RUBY_VM_CHECK_INTS_BLOCKING(thread->ec); /* may release mutex */
-
- if (!mutex->fiber) {
- mutex->fiber = fiber;
- }
- }
-}
-
-
static VALUE
do_mutex_lock(VALUE self, int interruptible_p)
{
@@ -400,7 +378,15 @@ do_mutex_lock(VALUE self, int interruptible_p)
rb_ractor_sleeper_threads_dec(th->ractor);
}
- do_mutex_lock_check_interrupts(interruptible_p, fiber, mutex, th);
+ if (interruptible_p) {
+ /* release mutex before checking for interrupts...as interrupt checking
+ * code might call rb_raise() */
+ if (mutex->fiber == fiber) mutex->fiber = 0;
+ RUBY_VM_CHECK_INTS_BLOCKING(th->ec); /* may release mutex */
+ if (!mutex->fiber) {
+ mutex->fiber = fiber;
+ }
+ }
}
if (mutex->fiber == fiber) mutex_locked(th, self);