Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

* lib/monitor.rb (wait): supported timeout.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 332e8fe51f0ba4107c6fef4957ddeb15a0681dec 1 parent cef8a99
Shugo Maeda shugo authored
Showing with 23 additions and 11 deletions.
  1. +21 −9 lib/monitor.rb
  2. +2 −2 test/monitor/test_monitor.rb
30 lib/monitor.rb
View
@@ -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 @@ def mon_synchronize
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)
4 test/monitor/test_monitor.rb
View
@@ -122,7 +122,7 @@ def test_cond
end
end
- def _test_timedwait
+ def test_timedwait
cond = @monitor.new_cond
b = "foo"
queue2 = Queue.new
@@ -153,7 +153,7 @@ def _test_timedwait
@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
Please sign in to comment.
Something went wrong with that request. Please try again.