diff options
author | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2020-09-21 09:54:08 +1200 |
---|---|---|
committer | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2020-09-21 11:48:44 +1200 |
commit | 70f08f1eed1df4579fef047d28fc3c807183fcfa (patch) | |
tree | 75b19e3db5bcb6367f000764bf7f5096fc28e0ed /internal | |
parent | 596173155a15b6d4a7b04bdaf9218b3e756a0683 (diff) |
Make `Thread#join` non-blocking.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3558
Diffstat (limited to 'internal')
-rw-r--r-- | internal/scheduler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/scheduler.h b/internal/scheduler.h index 73915ad651..186f4bd38c 100644 --- a/internal/scheduler.h +++ b/internal/scheduler.h @@ -19,7 +19,7 @@ VALUE rb_scheduler_close(VALUE scheduler); VALUE rb_scheduler_kernel_sleep(VALUE scheduler, VALUE duration); VALUE rb_scheduler_kernel_sleepv(VALUE scheduler, int argc, VALUE * argv); -VALUE rb_scheduler_block(VALUE scheduler, VALUE blocker); +VALUE rb_scheduler_block(VALUE scheduler, VALUE blocker, VALUE timeout); VALUE rb_scheduler_unblock(VALUE scheduler, VALUE blocker, VALUE fiber); VALUE rb_scheduler_io_wait(VALUE scheduler, VALUE io, VALUE events, VALUE timeout); |