summaryrefslogtreecommitdiff
path: root/thread_sync.c
diff options
context:
space:
mode:
authorSamuel Williams <samuel.williams@oriontransfer.co.nz>2020-09-21 09:54:08 +1200
committerSamuel Williams <samuel.williams@oriontransfer.co.nz>2020-09-21 11:48:44 +1200
commit70f08f1eed1df4579fef047d28fc3c807183fcfa (patch)
tree75b19e3db5bcb6367f000764bf7f5096fc28e0ed /thread_sync.c
parent596173155a15b6d4a7b04bdaf9218b3e756a0683 (diff)
Make `Thread#join` non-blocking.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3558
Diffstat (limited to 'thread_sync.c')
-rw-r--r--thread_sync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/thread_sync.c b/thread_sync.c
index 148e6091e6..ff3399ef3e 100644
--- a/thread_sync.c
+++ b/thread_sync.c
@@ -246,7 +246,7 @@ mutex_owned_p(rb_fiber_t *fiber, rb_mutex_t *mutex)
}
static VALUE call_rb_scheduler_block(VALUE mutex) {
- return rb_scheduler_block(rb_thread_current_scheduler(), mutex);
+ return rb_scheduler_block(rb_thread_current_scheduler(), mutex, Qnil);
}
static VALUE remove_from_mutex_lock_waiters(VALUE arg) {