archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add missing GVL hooks for M:N threads and ractors

Browse source
This commit is contained in:
John Hawthorn 2023-12-08 21:16:02 -08:00
parent 88d9a4d58a
commit b2ad4fec1a
4 changed files with 105 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

95
test/-ext-/thread/test_instrumentation_api.rb
View file

@ -1,7 +1,10 @@
# frozen_string_literal: false
require 'envutil'
require_relative "helper"
class TestThreadInstrumentation < Test::Unit::TestCase
include ThreadInstrumentation::TestHelper
def setup
pend("No windows support") if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM
@ -131,6 +134,52 @@ class TestThreadInstrumentation < Test::Unit::TestCase
assert_equal %i(started ready resumed suspended ready resumed suspended exited), timeline
end
def test_blocking_on_ractor
assert_ractor(<<-"RUBY", require_relative: "helper", require: "-test-/thread/instrumentation")
include ThreadInstrumentation::TestHelper
ractor = Ractor.new {
Ractor.receive # wait until woke
Thread.current
}
# Wait for the main thread to block, then wake the ractor
Thread.new do
while Thread.main.status != "sleep"
Thread.pass
end
ractor.send true
end
full_timeline = record do
ractor.take
end
timeline = timeline_for(Thread.current, full_timeline)
assert_consistent_timeline(timeline)
assert_equal %i(suspended ready resumed), timeline
RUBY
end
def test_sleeping_inside_ractor
assert_ractor(<<-"RUBY", require_relative: "helper", require: "-test-/thread/instrumentation")
include ThreadInstrumentation::TestHelper
thread = nil
full_timeline = record do
thread = Ractor.new{
sleep 0.1
Thread.current
}.take
end
timeline = timeline_for(thread, full_timeline)
assert_consistent_timeline(timeline)
assert_equal %i(started ready resumed suspended ready resumed suspended exited), timeline
RUBY
end
def test_thread_blocked_forever_on_mutex
mutex = Mutex.new
mutex.lock
@ -205,52 +254,6 @@ class TestThreadInstrumentation < Test::Unit::TestCase
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 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
def timeline_for(thread, timeline)
timeline.select { |t, _| t == thread }.map(&:last)
end
def fib(n = 30)
return n if n <= 1
fib(n-1) + fib(n-2)