redis-em-mutex 0.2.0 → 0.2.1

data/HISTORY.rdoc

@@ -1,3 +1,7 @@
+0.2.1
+- fixed: sleep
+- fixed: possible deadlock after #unlock! with multiple names
+
 0.2.0
 - added compatibility with EM::Synchrony::Thread::ConditionVariable
 - added #sleep and #wakeup

data/README.rdoc

@@ -44,7 +44,7 @@ Author::    Rafał Michalski  (mailto:rafal@yeondir.com)
 
 ==== Gemfile
 
-  gem "redis-em-mutex", "~> 0.2.0"
+  gem "redis-em-mutex", "~> 0.2.1"
 
 ==== Github
 

data/lib/redis/em-mutex/version.rb

@@ -1,7 +1,7 @@
 class Redis
   module EM
     class Mutex
-      VERSION = '0.2.0'
+      VERSION = '0.2.1'
     end
   end
 end

data/lib/redis/em-mutex.rb

@@ -3,7 +3,6 @@ require 'ostruct'
 require 'securerandom'
 require 'redis/connection/synchrony' unless defined? Redis::Connection::Synchrony
 require 'redis'
-require 'redis/em-mutex/version'
 
 class Redis
   module EM
@@ -210,24 +209,30 @@ class Redis
       # Releases the lock. Returns self on success.
       # Returns `false` if the semaphore wasn't locked or when it was locked but it has expired
       # and now it's got a new owner.
+      # In case of unlocking multiple name semaphore this method returns self only when all
+      # of the names have been unlocked successfully.
       def unlock!
-        ret = false
+        sem_left = @ns_names.length
         if @locked_id && owner_ident(@locked_id) == (lock_full_ident = @locked_owner_id)
           @@redis_pool.execute(false) do |r|
-            r.watch(*@ns_names) do
-              if r.mget(*@ns_names).all? {|v| v == lock_full_ident}
-                ret = !!r.multi do |multi|
-                  multi.del(*@ns_names)
-                  multi.publish SIGNAL_QUEUE_CHANNEL, Marshal.dump(@ns_names)
+            @ns_names.each do |name|
+              r.watch(name) do
+                if r.get(name) == lock_full_ident
+                  if (r.multi {|multi|
+                      multi.del(name)
+                      multi.publish SIGNAL_QUEUE_CHANNEL, Marshal.dump([name])
+                    })
+                    sem_left -= 1
+                  end
+                else
+                  r.unwatch
                 end
-              else
-                r.unwatch
               end
             end
           end
           @locked_owner_id = @locked_id = nil
         end
-        ret && self
+        sem_left.zero? && self
       end
 
       # Releases the lock unconditionally.
@@ -548,7 +553,7 @@ class Redis
         # EM sleep helper
         def sleep(seconds)
           fiber = Fiber.current
-          ::EM::Timer.new(secs) { fiber.resume }
+          ::EM::Timer.new(seconds) { fiber.resume }
           Fiber.yield
         end
 
@@ -635,3 +640,5 @@ class Redis
     end
   end
 end
+
+require 'redis/em-mutex/version'

data/lib/redis-em-mutex.rb

@@ -1,4 +1,4 @@
-if defined?(Redis::EM::Mutex)
+if defined?(::Redis) && ::Redis.const_defined?(:EM, false) && ::Redis::EM.const_defined?(:Mutex, false)
   require 'redis/em-mutex'
 else
   class Redis

data/spec/redis-em-mutex-condition.rb

@@ -54,8 +54,8 @@ describe Redis::EM::Mutex do
       ::EM.add_timer(0.15) do
         mutex.wakeup(fiber)
       end
-      mutex.sleep(0.25).should be_within(0.001).of(0.15)
-      (Time.now - start).should be_within(0.001).of(0.15)
+      mutex.sleep(0.25).should be_within(0.005).of(0.15)
+      (Time.now - start).should be_within(0.005).of(0.15)
       mutex.owned?.should be true
       mutex.unlock!.should be_true
     ensure
@@ -122,7 +122,7 @@ describe Redis::EM::Mutex do
     end
     start = Time.now
     now = Fiber.yield
-    (now - signal).should be_within(0.001).of(0.001)
+    (now - signal).should be_within(0.002).of(0.001)
     (now - start).should be_within(0.01).of(0.2)
     mutex.synchronize do
       signal = nil

data/spec/redis-em-mutex-features.rb

@@ -80,6 +80,12 @@ describe Redis::EM::Mutex do
     redis.client.scheme.should eq 'redis'  
   end
 
+  it "should be able to sleep" do
+    t = Time.now
+    described_class.sleep 0.11
+    (Time.now - t).should be_within(0.02).of(0.11)
+  end
+
   around(:each) do |testcase|
     @after_em_stop = nil
     ::EM.synchrony do

data/spec/redis-em-mutex-owners.rb

@@ -103,7 +103,7 @@ describe Redis::EM::Mutex do
           ::EM.next_tick { fiber.resume }
           start = Time.now
           mutex2.lock.should be true
-          (Time.now - start).should be_within(0.01).of(0.5)
+          (Time.now - start).should be_within(0.02).of(0.5)
         rescue Exception => e
           @exception = e
         ensure

data/spec/redis-em-mutex-semaphores.rb

@@ -386,6 +386,27 @@ describe Redis::EM::Mutex do
     end
   end
 
+  it "should unlock multiple names independently" do
+    begin
+      mutex = described_class.lock(*@lock_names[0,2], expire: 0.01)
+      mutex.should be_an_instance_of described_class
+      EM::Synchrony.sleep 0.02
+      fiber = Fiber.current
+      EM::Synchrony.next_tick {
+        mutex2 = described_class.lock(*@lock_names[1,2])
+        mutex2.should be_an_instance_of described_class
+        mutex2.unlock!.should be mutex2
+        fiber.resume
+      }
+      Fiber.yield
+      mutex.unlock!.should be false
+      mutex.lock.should be true
+      mutex.should be_an_instance_of described_class
+    ensure
+      mutex.unlock if mutex
+    end
+  end
+
   around(:each) do |testcase|
     @after_em_stop = nil
     @exception = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-em-mutex
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &133617360 !ruby/object:Gem::Requirement
+  requirement: &219325340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *133617360
+  version_requirements: *219325340
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &133616520 !ruby/object:Gem::Requirement
+  requirement: &219340740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *133616520
+  version_requirements: *219340740
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &133615240 !ruby/object:Gem::Requirement
+  requirement: &219339740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0.beta.1
   type: :runtime
   prerelease: false
-  version_requirements: *133615240
+  version_requirements: *219339740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &133614140 !ruby/object:Gem::Requirement
+  requirement: &219338960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *133614140
+  version_requirements: *219338960
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &133629580 !ruby/object:Gem::Requirement
+  requirement: &219338220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *133629580
+  version_requirements: *219338220
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &133629000 !ruby/object:Gem::Requirement
+  requirement: &219337400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *133629000
+  version_requirements: *219337400
 description: Cross server-process-fiber EventMachine + Redis based semaphore with
   many features
 email: rafal@yeondir.com