Rewrite monitor specs to use queues to synchronize threads.

Author: aardvark179

spec/ruby/library/monitor/enter_spec.rb

@@ -5,21 +5,22 @@
   it "acquires the monitor" do
     monitor = Monitor.new
     10.times do
-      locked = false
+      wait_q = Queue.new
+      continue_q = Queue.new
 
       thread = Thread.new do
         begin
           monitor.enter
-          locked = true
-          sleep # wait for wakeup.
+          wait_q << true
+          continue_q.pop
         ensure
           monitor.exit
         end
       end
 
-      Thread.pass until locked
+      wait_q.pop
       monitor.mon_locked?.should == true
-      thread.wakeup
+      continue_q << true
       thread.join
       monitor.mon_locked?.should == false
     end

spec/ruby/library/monitor/new_cond_spec.rb

@@ -14,18 +14,18 @@
 
     10.times do
 
-      locked = false
+      wait_q = Queue.new
       thread = Thread.new do
         m.synchronize do
-          locked = true
+          wait_q << true
           c.wait
         end
         :done
       end
 
-      Thread.pass until locked
-      Thread.pass until thread.stop?
+      wait_q.pop
 
+      # Synchronize can't happen until the other thread is waiting.
       m.synchronize { c.signal }
 
       thread.join
@@ -39,20 +39,20 @@
 
     10.times do
 
-      locked = false
+      wait_q = Queue.new
       thread = Thread.new do
         m.synchronize do
           m.synchronize do
-            locked = true
+            wait_q << true
             c.wait
           end
         end
         :done
       end
 
-      Thread.pass until locked
-      Thread.pass until thread.stop?
+      wait_q.pop
 
+      #No need to wait here as we cannot synchronize until the other thread is waiting.
       m.synchronize { c.signal }
 
       thread.join
@@ -66,18 +66,18 @@
 
     10.times do
 
-      locked = false
+      wait_q = Queue.new
       thread = Thread.new do
         m.synchronize do
-          locked = true
+          wait_q << true
           c.wait
         end
         :done
       end
 
-      Thread.pass until locked
-      Thread.pass until thread.stop?
+      wait_q.pop
 
+      # Synchronize can't happen until the other thread is waiting.
       m.synchronize { m.synchronize { c.signal } }
 
       thread.join

spec/ruby/library/monitor/synchronize_spec.rb

@@ -7,23 +7,25 @@
 
     monitor = Monitor.new
     10.times do
-      locked = false
+      wait_q = Queue.new
+      continue_q = Queue.new
 
       thread = Thread.new do
         begin
           monitor.synchronize do
-            locked = true
+            wait_q << true
             # Do not wait here, we are trying to interrupt the ensure part of #synchronize
           end
-          sleep # wait for exception if it did not happen yet
+          continue_q.pop
         rescue exc_class
           monitor.should_not.mon_locked?
           :ok
         end
       end
 
-      Thread.pass until locked
+      wait_q.pop
       thread.raise exc_class, "interrupt"
+      continue_q << true
       thread.value.should == :ok
     end
   end