From fe7d77cc01ae652a15b2c1896f677a56133bc0f1 Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Mon, 8 Feb 2016 05:13:05 +1030 Subject: Test the happy path for recursive yields too --- activesupport/test/share_lock_test.rb | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/activesupport/test/share_lock_test.rb b/activesupport/test/share_lock_test.rb index 143e65aa0c..acefa185a8 100644 --- a/activesupport/test/share_lock_test.rb +++ b/activesupport/test/share_lock_test.rb @@ -341,6 +341,41 @@ class ShareLockTest < ActiveSupport::TestCase threads.each(&:kill) if threads end + def test_manual_recursive_yield + ready = Concurrent::CyclicBarrier.new(2) + done = Concurrent::CyclicBarrier.new(2) + do_nesting = Concurrent::CountDownLatch.new + + threads = [ + Thread.new do + @lock.sharing do + ready.wait + @lock.exclusive(purpose: :x) {} + done.wait + end + end, + + Thread.new do + @lock.sharing do + @lock.yield_shares(compatible: [:x]) do + @lock.sharing do + ready.wait + do_nesting.wait + @lock.yield_shares(compatible: [:x, :y]) do + done.wait + end + end + end + end + end + ] + + assert_threads_stuck threads + do_nesting.count_down + + assert_threads_not_stuck threads + end + def test_manual_recursive_yield_cannot_expand_outer_compatible ready = Concurrent::CyclicBarrier.new(2) do_compatible_nesting = Concurrent::CountDownLatch.new -- cgit v1.2.3