Removing the last traces of Monitor from Agent. I guess we didn't nee…

…d re-entrant mutexes after all.
igrigorik · Mar 21, 2012 · a5ee664 · a5ee664 · corasaurus-hex · Mar 21, 2012
1 parent ee27c7b
commit a5ee664
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/lib/agent/all.rb b/lib/agent/all.rb
@@ -1,5 +1,4 @@
 require "thread"
-require "monitor"
 
 require "agent/version"
 require "agent/errors"

diff --git a/spec/blocking_once_spec.rb b/spec/blocking_once_spec.rb
@@ -85,28 +85,28 @@
     r, s = [], Time.now.to_f
 
     # Using condition variables to maximize potential contention
-    monitor   = Monitor.new
-    condition = monitor.new_cond
+    mutex     = Mutex.new
+    condition = ConditionVariable.new
 
     waiting_channel  = channel!(:type => TrueClass, :size => 2)
     finished_channel = channel!(:type => TrueClass, :size => 2)
 
     go! do
-      monitor.synchronize{ waiting_channel.send(true); condition.wait }
+      mutex.synchronize{ waiting_channel.send(true); condition.wait(mutex) }
       @blocking_once.perform{ sleep 0.1; r << 1 }
       finished_channel.send(true)
     end
 
     go! do
-      monitor.synchronize{ waiting_channel.send(true); condition.wait }
+      mutex.synchronize{ waiting_channel.send(true); condition.wait(mutex) }
       @blocking_once.perform{ sleep 0.1; r << 1 }
       finished_channel.send(true)
     end
 
     # wait for both the goroutines to be waiting
     2.times{ waiting_channel.receive }
 
-    monitor.synchronize{ condition.broadcast }
+    mutex.synchronize{ condition.broadcast }
 
     # wait for the finished channel to be completed
     2.times{ finished_channel.receive }

diff --git a/spec/once_spec.rb b/spec/once_spec.rb
@@ -55,28 +55,28 @@
     r, s = [], Time.now.to_f
 
     # Using condition variables to maximize potential contention
-    monitor   = Monitor.new
-    condition = monitor.new_cond
+    mutex     = Mutex.new
+    condition = ConditionVariable.new
 
     waiting_channel  = channel!(:type => TrueClass, :size => 2)
     finished_channel = channel!(:type => TrueClass, :size => 2)
 
     go! do
-      monitor.synchronize{ waiting_channel.send(true); condition.wait }
+      mutex.synchronize{ waiting_channel.send(true); condition.wait(mutex) }
       @once.perform{ sleep 0.1; r << 1 }
       finished_channel.send(true)
     end
 
     go! do
-      monitor.synchronize{ waiting_channel.send(true); condition.wait }
+      mutex.synchronize{ waiting_channel.send(true); condition.wait(mutex) }
       @once.perform{ sleep 0.1; r << 1 }
       finished_channel.send(true)
     end
 
     # wait for both the goroutines to be waiting
     2.times{ waiting_channel.receive }
 
-    monitor.synchronize{ condition.broadcast }
+    mutex.synchronize{ condition.broadcast }
 
     # wait for the finished channel to be completed
     2.times{ finished_channel.receive }