aboutsummaryrefslogtreecommitdiffstats
path: root/scheduler.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 /scheduler.c
parent596173155a15b6d4a7b04bdaf9218b3e756a0683 (diff)
downloadruby-70f08f1eed1df4579fef047d28fc3c807183fcfa.tar.gz
Make `Thread#join` non-blocking.
Diffstat (limited to 'scheduler.c')
-rw-r--r--scheduler.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/scheduler.c b/scheduler.c
index 2dfecafca5..8ec5039096 100644
--- a/scheduler.c
+++ b/scheduler.c
@@ -61,9 +61,9 @@ VALUE rb_scheduler_kernel_sleepv(VALUE scheduler, int argc, VALUE * argv)
return rb_funcallv(scheduler, id_kernel_sleep, argc, argv);
}
-VALUE rb_scheduler_block(VALUE scheduler, VALUE blocker)
+VALUE rb_scheduler_block(VALUE scheduler, VALUE blocker, VALUE timeout)
{
- return rb_funcall(scheduler, id_block, 1, blocker);
+ return rb_funcall(scheduler, id_block, 2, blocker, timeout);
}
VALUE rb_scheduler_unblock(VALUE scheduler, VALUE blocker, VALUE fiber)