* lib/thread.rb (ConditionVariable#wait): add timeout argument.

  [ruby-talk:346154]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/thread.rb b/lib/thread.rb
index cb6d8c62f..34c2a506d 100644
--- a/lib/thread.rb
+++ b/lib/thread.rb
@@ -59,13 +59,16 @@ class ConditionVariable
   #
   # Releases the lock held in +mutex+ and waits; reacquires the lock on wakeup.
   #
-  def wait(mutex)
+  # If +timeout+ is given, this method returns after +timeout+ seconds passed,
+  # even if no other thread doesn't signal.
+  #
+  def wait(mutex, timeout=nil)
     begin
       # TODO: mutex should not be used
       @waiters_mutex.synchronize do
         @waiters.push(Thread.current)
       end
-      mutex.sleep
+      mutex.sleep timeout
     end
   end