Fix Thread blocking count drifting across Fiber switches - #9607
Merged
Merged
Conversation
Fiber.current_scheduler reads the Thread's blocking count, and it drifted both ways: Fiber#resume decremented a target that exchangeWithFiber had already decremented, and the hand-back was counted twice. Account like MRI's fiber_switch instead, where each Fiber adjusts only for itself. Adds core/fiber/current_scheduler_spec.rb from ruby/spec#1388 and drops the tag added in jruby#9604. Also adds additional root Fiber specs from ruby/spec#1390.
headius
approved these changes
Aug 26, 2026
headius
left a comment
Member
There was a problem hiding this comment.
Looks pretty clean and this seems clearer and more explicit than the original logic. Thank you!
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.
Fiber.current_scheduler reads the Thread's blocking count, and it drifted both ways: Fiber#resume decremented a target that exchangeWithFiber had already decremented, and the hand-back was counted twice. Account like MRI's fiber_switch instead, where each Fiber adjusts only for itself.
Adds core/fiber/current_scheduler_spec.rb from ruby/spec#1388 and drops the tag added in #9604. Also adds additional root Fiber specs from ruby/spec#1390.
Not as simple a change as #9604, but this should fix the blocking count drift.
Of the added tests, 5 of 11 fail on master. Failing ones:
Oneliner to test the drift:
jruby -e 'require "jruby"; f = org.jruby.RubyThread.java_class.declared_field("blockingCount"); f.accessible = true; c = -> { f.get(JRuby.reference(Thread.current)) }; puts "before: #{c.call}"; 20_000.times { Fiber.new(blocking: true) { }.resume }; puts "after: #{c.call}"'Master:
before: 1
after: -19999
This branch:
before: 1
after: 1