redis-mutex 2.1.0 → 2.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 93509c7e322a8d7f8b8aab44e8b679b4943aaf21
+  data.tar.gz: 10570c618421703581ee0ea2cb74d6fca9b33b91
+SHA512:
+  metadata.gz: 75ceb7ece788185aa6c8a0a32f6b36ad2a524775bb2e2e44f4751c61400fcc742d0f326e37f72857ebefd709e7e007da384522093f04e65eabe6d2dd3ca1ab5f
+  data.tar.gz: 50541e94bd60a2af29a2b835b6a909ec160b62590f104db0f61454e16e026d0e7dd678cb9b3ee7c8fe3cc5683f6eb05e3394f96030774ee1006ca0cc75ce4751

data/lib/redis/mutex.rb

@@ -45,12 +45,16 @@ class Redis
     def try_lock
       now = Time.now.to_f
       @expires_at = now + @expire                       # Extend in each blocking loop
-      return true   if setnx(@expires_at)               # Success, the lock has been acquired
-      return false  if get.to_f > now                   # Check if the lock is still effective
+
+      loop do
+        return true if setnx(@expires_at)               # Success, the lock has been acquired
+      end until old_value = get                         # Repeat if unlocked before get
+
+      return false if old_value.to_f > now              # Check if the lock is still effective
 
       # The lock has expired but wasn't released... BAD!
-      return true   if getset(@expires_at).to_f <= now   # Success, we acquired the previously expired lock
-      return false  # Dammit, it seems that someone else was even faster than us to remove the expired lock!
+      return true if getset(@expires_at).to_f <= now    # Success, we acquired the previously expired lock
+      return false # Dammit, it seems that someone else was even faster than us to remove the expired lock!
     end
 
     # Returns true if resource is locked. Note that nil.to_f returns 0.0

data/redis-mutex.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "redis-mutex"
   gem.require_paths = ["lib"]
-  gem.version       = '2.1.0' # retrieve this value by: Gem.loaded_specs['redis-mutex'].version.to_s
+  gem.version       = '2.1.1' # retrieve this value by: Gem.loaded_specs['redis-mutex'].version.to_s
 
   gem.add_runtime_dependency "redis-classy", "~> 1.2"
   gem.add_development_dependency "rspec"

data/spec/redis_mutex_spec.rb

@@ -171,4 +171,46 @@ describe Redis::Mutex do
       t2.join
     end
   end
+
+  describe 'stress test' do
+    LOOP_NUM = 1000
+
+    def run(id)
+      print "invoked worker #{id}...\n"
+      Redis::Classy.db.client.reconnect
+      mutex = Redis::Mutex.new(:test_lock, :expire => 1, :block => 10, :sleep => 0.01)
+      result = 0
+      LOOP_NUM.times do |i|
+        mutex.with_lock do
+          result += 1
+          sleep rand/100
+        end
+      end
+      print "result for worker #{id}: #{result} successful locks\n"
+      exit!(result == LOOP_NUM)
+    end
+
+    it 'runs without hiccups' do
+      begin
+        STDOUT.sync = true
+        puts "\nrunning stress tests..."
+        if pid1 = fork
+          # Parent
+          if pid2 = fork
+            # Parent
+            Process.waitall
+          else
+            # Child 2
+            run(2)
+          end
+        else
+          # Child 1
+          run(1)
+        end
+        STDOUT.flush
+      rescue NotImplementedError
+        puts $!
+      end
+    end
+  end
 end

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: redis-mutex
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    none: false
-  prerelease: false
   name: redis-classy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    none: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
+        version: '1.2'
+- !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Distrubuted mutex using Redis
 email:
 - kenn.ejima@gmail.com
@@ -97,33 +88,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/kenn/redis-mutex
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4158529389064232866
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4158529389064232866
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Distrubuted mutex using Redis
 test_files:
 - spec/redis_mutex_spec.rb