Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add missing GVL hooks for M:N threads and ractors
[Bug #20019] This fixes GVL instrumentation in three locations it was missing: - Suspending when blocking on a Ractor - Suspending when doing a coroutine transfer from an M:N thread - Resuming after an M:N thread starts Co-authored-by: Matthew Draper <matthew@trebex.net>
- Loading branch information
Showing
4 changed files
with
94 additions
and
46 deletions.
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
module ThreadInstrumentation | ||
module TestHelper | ||
private | ||
|
||
def record | ||
Bug::ThreadInstrumentation.register_callback(!ENV["GVL_DEBUG"]) | ||
yield | ||
ensure | ||
timeline = Bug::ThreadInstrumentation.unregister_callback | ||
if $! | ||
raise | ||
else | ||
return timeline | ||
end | ||
end | ||
|
||
def timeline_for(thread, timeline) | ||
timeline.select { |t, _| t == thread }.map(&:last) | ||
end | ||
|
||
def assert_consistent_timeline(events) | ||
refute_predicate events, :empty? | ||
|
||
previous_event = nil | ||
events.each do |event| | ||
refute_equal :exited, previous_event, "`exited` must be the final event: #{events.inspect}" | ||
case event | ||
when :started | ||
assert_nil previous_event, "`started` must be the first event: #{events.inspect}" | ||
when :ready | ||
unless previous_event.nil? | ||
assert %i(started suspended).include?(previous_event), "`ready` must be preceded by `started` or `suspended`: #{events.inspect}" | ||
end | ||
when :resumed | ||
unless previous_event.nil? | ||
assert_equal :ready, previous_event, "`resumed` must be preceded by `ready`: #{events.inspect}" | ||
end | ||
when :suspended | ||
unless previous_event.nil? | ||
assert_equal :resumed, previous_event, "`suspended` must be preceded by `resumed`: #{events.inspect}" | ||
end | ||
when :exited | ||
unless previous_event.nil? | ||
assert %i(resumed suspended).include?(previous_event), "`exited` must be preceded by `resumed` or `suspended`: #{events.inspect}" | ||
end | ||
end | ||
previous_event = event | ||
end | ||
end | ||
end | ||
end |
This file contains 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
This file contains 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
This file contains 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