Repository navigation
Defer Kernel#sleep to the Fiber scheduler - #9622
Merged
Merged
Conversation
Kernel#sleep never consulted Fiber.scheduler, so a non-blocking Fiber that slept parked its thread instead of yielding. Follow MRI's rb_f_sleep: look up the current scheduler first and hand it the arguments untouched, nil included, before any interval conversion. FiberScheduler.kernelSleep was already written, this just wires it up. Closing the scheduler at exit is also fixed. MRI's rb_ec_teardown sets the thread's scheduler to nil before at-exit handlers, which runs out the fibers still waiting on it; JRuby only did that for spawned threads, through RubyThread#dispose. Harmless until now, since nothing parked a fiber on the main thread. But with sleep deferring, a fiber sleeping there would never be resumed, skipping the rest of its body and its ensure blocks.
headius
approved these changes
Sep 3, 2026
headius
left a comment
Member
There was a problem hiding this comment.
Yup, good catch. Since I originally implemented the thread scheduler stuff, more blocking operations have steadily been added. Good to get sleep checked off the list.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Kernel#sleep never consulted Fiber.scheduler, so a non-blocking Fiber that slept parked its thread instead of yielding. Follow MRI's rb_f_sleep: look up the current scheduler first and hand it the arguments untouched, nil included, before any interval conversion. FiberScheduler.kernelSleep was already written, this just wires it up.
Closing the scheduler at exit is also fixed. MRI's rb_ec_teardown sets the thread's scheduler to nil before at-exit handlers, which runs out the fibers still waiting on it; JRuby only did that for spawned threads, through RubyThread#dispose. Harmless until now, since nothing parked a fiber on the main thread. But with sleep deferring, a fiber sleeping there would never be resumed, skipping the rest of its body and its ensure blocks.
Passes the tests in ruby/spec#1391, while master fails the new "closes the scheduler at exit" spec.
Follow-up needed: wire
Thread::Queue#popandThread::Mutex#locktoFiberScheduler.block/unblockand delete the test exclusions added in this PR.