diff options
author | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2021-02-09 19:39:56 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-09 19:39:56 +1300 |
commit | 5f69a7f60467fa58c2f998daffab43e118bff36c (patch) | |
tree | f60e3a5add29eb9cc7e68433c4e373e2a2facab7 /process.c | |
parent | 3c593f28ede99b77d4fe3258f9bda78dcee238a3 (diff) |
Expose scheduler as public interface & bug fixes. (#3945)
* Rename `rb_scheduler` to `rb_fiber_scheduler`.
* Use public interface if available.
* Use `rb_check_funcall` where possible.
* Don't use `unblock` unless the fiber was non-blocking.
Notes
Notes:
Merged-By: ioquatix <samuel@codeotaku.com>
Diffstat (limited to 'process.c')
-rw-r--r-- | process.c | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -13,7 +13,7 @@ #include "ruby/internal/config.h" -#include "internal/scheduler.h" +#include "ruby/fiber/scheduler.h" #include "coroutine/Stack.h" #include <ctype.h> @@ -1345,10 +1345,9 @@ rb_process_status_wait(rb_pid_t pid, int flags) { // We only enter the scheduler if we are "blocking": if (!(flags & WNOHANG)) { - VALUE scheduler = rb_scheduler_current(); - if (rb_scheduler_supports_process_wait(scheduler)) { - return rb_scheduler_process_wait(scheduler, pid, flags); - } + VALUE scheduler = rb_fiber_scheduler_current(); + VALUE result = rb_fiber_scheduler_process_wait(scheduler, pid, flags); + if (result != Qundef) return result; } COROUTINE_STACK_LOCAL(struct waitpid_state, w); @@ -5104,10 +5103,10 @@ static VALUE rb_f_sleep(int argc, VALUE *argv, VALUE _) { time_t beg = time(0); - VALUE scheduler = rb_scheduler_current(); + VALUE scheduler = rb_fiber_scheduler_current(); if (scheduler != Qnil) { - rb_scheduler_kernel_sleepv(scheduler, argc, argv); + rb_fiber_scheduler_kernel_sleepv(scheduler, argc, argv); } else { if (argc == 0) { |