zk 1.1.0 → 1.1.1

data/lib/zk/version.rb

@@ -1,3 +1,3 @@
 module ZK
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/zk/locker_spec.rb

@@ -76,44 +76,6 @@ describe 'ZK::Client#locker' do
 
 end
 
-# describe 'Locker thread safety' do
-#   describe 'exception' do
-#     before do
-#       @path = '/zk_test'
-#       @zk = ZK.new("localhost:#{ZK.test_port}")
-#       @zk.create(@path) rescue ZK::Exceptions::NodeExists
-#     end
-
-#     after do
-#       @zk.rm_rf(@path)
-#       @zk.close!
-#     end
-
-#     it %[should raise an EventDispatchThreadException if called in the dispatch thread] do
-#       @exception = nil
-
-#       @zk.register(@path) do |event|
-#         @zk.event_dispatch_thread?.should be_true
-
-#         begin
-#           @zk.with_lock('boguslockname') do
-#             raise "Should never have gotten this far"
-#           end
-#         rescue Exception => e
-#           @exception = e
-#         end
-#       end
-
-#       @zk.exists?(@path, :watch => true)
-
-#       @zk.set(@path, 'blah')
-
-#       wait_until(2) { @exception }.should be_kind_of(ZK::Exceptions::EventDispatchThreadException)
-#     end
-#   end
-
-# end
-
 shared_examples_for 'SharedLocker' do
   before do
     @shared_locker  = ZK::Locker.shared_locker(zk, path)
@@ -253,98 +215,80 @@ end # ExclusiveLocker
 
 shared_examples_for 'shared-exclusive interaction' do
   before do
+    zk.rm_rf('/_zklocking')
     @sh_lock = ZK::Locker.shared_locker(zk, path)
     @ex_lock = ZK::Locker.exclusive_locker(zk2, path)
   end
 
   describe 'shared lock acquired first' do
     it %[should block exclusive locks from acquiring until released] do
-      q1 = Queue.new
-      q2 = Queue.new
-
-      th1 = Thread.new do
-        @sh_lock.with_lock do
-          q1.enq(:got_lock)
-          Thread.current[:got_lock] = true
-          q2.pop
-        end
-      end
-
-      th2 = Thread.new do
-        q1.pop # wait for th1 to get the shared lock
-
-        Thread.current[:acquiring_lock] = true
+      @sh_lock.lock!.should be_true
+      @ex_lock.lock!.should be_false
 
+      mutex = Monitor.new
+      cond = mutex.new_cond
+      
+      th = Thread.new do
+        logger.debug { "@ex_lock trying to acquire acquire lock" }
         @ex_lock.with_lock do
-          Thread.current[:got_lock] = true
+          th[:got_lock] = @ex_lock.locked?
+          logger.debug { "@ex_lock.locked? #{@ex_lock.locked?}" }
+
+          mutex.synchronize do
+            cond.broadcast
+          end
         end
       end
 
-      th1.join_until { th1[:got_lock] }
-      th1[:got_lock].should be_true
-
-      th2.join_until { th2[:acquiring_lock] }
-      th2[:acquiring_lock].should be_true
-
-      q2.num_waiting.should > 0
-      q2.enq(:release)
-
-      th1.join_until { q2.size == 0 }
-      q2.size.should == 0
+      mutex.synchronize do
+        logger.debug { "unlocking the shared lock" }
+        @sh_lock.unlock!.should be_true
+        cond.wait_until { th[:got_lock] }   # make sure they actually received the lock (avoid race)
+        th[:got_lock].should be_true
+        logger.debug { "ok, they got the lock" }
+      end
 
-      th1.join(2).should == th1
+      th.join(5).should == th
 
-      th2.join_until { th2[:got_lock] }
-      th2[:got_lock].should be_true
+      logger.debug { "thread joined, exclusive lock should be releasd" }
 
-      th2.join(2).should == th2
+      @ex_lock.should_not be_locked
     end
   end
 
   describe 'exclusive lock acquired first' do
     it %[should block shared lock from acquiring until released] do
-      # same test as above but with the thread's locks switched, 
-      # th1 is the exclusive locker
+      @ex_lock.lock!.should be_true
+      @sh_lock.lock!.should be_false
 
-      q1 = Queue.new
-      q2 = Queue.new
+      mutex = Monitor.new
+      cond = mutex.new_cond
+      
+      th = Thread.new do
+        logger.debug { "@ex_lock trying to acquire acquire lock" }
+        @sh_lock.with_lock do
+          th[:got_lock] = @sh_lock.locked?
+          logger.debug { "@sh_lock.locked? #{@sh_lock.locked?}" }
 
-      th1 = Thread.new do
-        @ex_lock.with_lock do
-          q1.enq(:got_lock)
-          Thread.current[:got_lock] = true
-          q2.pop
+          mutex.synchronize do
+            cond.broadcast
+          end
         end
       end
 
-      th2 = Thread.new do
-        q1.pop # wait for th1 to get the shared lock
-
-        Thread.current[:acquiring_lock] = true
-
-        @sh_lock.with_lock do
-          Thread.current[:got_lock] = true
-        end
+      mutex.synchronize do
+        logger.debug { "unlocking the shared lock" }
+        @ex_lock.unlock!.should be_true
+        cond.wait_until { th[:got_lock] }   # make sure they actually received the lock (avoid race)
+        th[:got_lock].should be_true
+        logger.debug { "ok, they got the lock" }
       end
 
-      th1.join_until { th1[:got_lock] }
-      th1[:got_lock].should be_true
-
-      th2.join_until { th2[:acquiring_lock] }
-      th2[:acquiring_lock].should be_true
-
-      q2.num_waiting.should > 0
-      q2.enq(:release)
-
-      th1.join_until { q2.size == 0 }
-      q2.size.should == 0
-
-      th1.join(2).should == th1
+      th.join(5).should == th
 
-      th2.join_until { th2[:got_lock] }
-      th2[:got_lock].should be_true
+      logger.debug { "thread joined, exclusive lock should be releasd" }
 
-      th2.join(2).should == th2
+      @sh_lock.should_not be_locked
     end
   end
 

data/spec/zk/pool_spec.rb

@@ -109,7 +109,7 @@ describe ZK::Pool do
 
         @connection_pool.force_close!
 
-        lambda { th.join(2) }.should raise_error(ZK::Exceptions::PoolIsShuttingDownException)
+        lambda { th.join(5) }.should raise_error(ZK::Exceptions::PoolIsShuttingDownException)
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-02 00:00:00 Z
+date: 2012-05-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: slyphon-zookeeper
@@ -78,6 +78,9 @@ files:
 - lib/zk/extensions.rb
 - lib/zk/find.rb
 - lib/zk/locker.rb
+- lib/zk/locker/exclusive_locker.rb
+- lib/zk/locker/locker_base.rb
+- lib/zk/locker/shared_locker.rb
 - lib/zk/logging.rb
 - lib/zk/message_queue.rb
 - lib/zk/mongoid.rb