summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/monitor.rb30
-rw-r--r--test/monitor/test_monitor.rb4
2 files changed, 23 insertions, 11 deletions
diff --git a/lib/monitor.rb b/lib/monitor.rb
index b9bf28ded06..d4bfb670b23 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -87,46 +87,57 @@ module MonitorMixin
class ConditionVariable
class Timeout < Exception; end
+ #
+ # Releases the lock held in the associated monitor and waits; reacquires the lock on wakeup.
+ #
+ # If +timeout+ is given, this method returns after +timeout+ seconds passed,
+ # even if no other thread doesn't signal.
+ #
def wait(timeout = nil)
- if timeout
- raise NotImplementedError, "timeout is not implemented yet"
- end
@monitor.__send__(:mon_check_owner)
count = @monitor.__send__(:mon_exit_for_cond)
begin
- @cond.wait(@monitor.instance_variable_get("@mon_mutex"))
+ @cond.wait(@monitor.instance_variable_get("@mon_mutex"), timeout)
return true
ensure
@monitor.__send__(:mon_enter_for_cond, count)
end
end
+ #
+ # Calls wait repeatedly while the given block yields a truthy value.
+ #
def wait_while
while yield
wait
end
end
+ #
+ # Calls wait repeatedly until the given block yields a truthy value.
+ #
def wait_until
until yield
wait
end
end
+ #
+ # Wakes up the first thread in line waiting for this lock.
+ #
def signal
@monitor.__send__(:mon_check_owner)
@cond.signal
end
+ #
+ # Wakes up all threads waiting for this lock.
+ #
def broadcast
@monitor.__send__(:mon_check_owner)
@cond.broadcast
end
- def count_waiters
- raise NotImplementedError
- end
-
private
def initialize(monitor)
@@ -195,7 +206,8 @@ module MonitorMixin
alias synchronize mon_synchronize
#
- # FIXME: This isn't documented in Nutshell.
+ # Creates a new MonitorMixin::ConditionVariable associated with the
+ # receiver.
#
def new_cond
return ConditionVariable.new(self)
diff --git a/test/monitor/test_monitor.rb b/test/monitor/test_monitor.rb
index 973b3c2744f..8591570b700 100644
--- a/test/monitor/test_monitor.rb
+++ b/test/monitor/test_monitor.rb
@@ -122,7 +122,7 @@ class TestMonitor < Test::Unit::TestCase
end
end
- def _test_timedwait
+ def test_timedwait
cond = @monitor.new_cond
b = "foo"
queue2 = Queue.new
@@ -153,7 +153,7 @@ class TestMonitor < Test::Unit::TestCase
@monitor.synchronize do
assert_equal("foo", c)
result3 = cond.wait(0.1)
- assert_equal(false, result3)
+ assert_equal(true, result3) # wait always returns true in Ruby 1.9
assert_equal("foo", c)
queue3.enq(nil)
result4 = cond.wait