diff options
| -rw-r--r-- | lib/monitor.rb | 18 | ||||
| -rw-r--r-- | test/monitor/test_monitor.rb | 22 |
2 files changed, 33 insertions, 7 deletions
diff --git a/lib/monitor.rb b/lib/monitor.rb index 288ed755ea..2a59fa7cc0 100644 --- a/lib/monitor.rb +++ b/lib/monitor.rb @@ -103,13 +103,17 @@ module MonitorMixin # even if no other thread doesn't signal. # def wait(timeout = nil) - @monitor.__send__(:mon_check_owner) - count = @monitor.__send__(:mon_exit_for_cond) - begin - @cond.wait(@monitor.instance_variable_get(:@mon_mutex), timeout) - return true - ensure - @monitor.__send__(:mon_enter_for_cond, count) + Thread.handle_interrupt(Exception => :never) do + @monitor.__send__(:mon_check_owner) + count = @monitor.__send__(:mon_exit_for_cond) + begin + Thread.handle_interrupt(Exception => :immediate) do + @cond.wait(@monitor.instance_variable_get(:@mon_mutex), timeout) + end + return true + ensure + @monitor.__send__(:mon_enter_for_cond, count) + end end end diff --git a/test/monitor/test_monitor.rb b/test/monitor/test_monitor.rb index a036069647..8854b59ccc 100644 --- a/test/monitor/test_monitor.rb +++ b/test/monitor/test_monitor.rb @@ -269,4 +269,26 @@ class TestMonitor < Test::Unit::TestCase # end # cumber_thread.kill end + + def test_wait_interruption + queue = Queue.new + cond = @monitor.new_cond + @monitor.define_singleton_method(:mon_enter_for_cond) do |*args| + queue.deq + super(*args) + end + th = Thread.start { + @monitor.synchronize do + begin + cond.wait(0.1) + rescue Interrupt + @monitor.instance_variable_get(:@mon_owner) + end + end + } + sleep(0.1) + th.raise(Interrupt) + queue.enq(nil) + assert_equal th, th.value + end end |