distributed_mutex 1.0.2 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/lib/distributed_mutex.rb

@@ -1,4 +1,5 @@
 require 'mutex_lock_timeout'
+require 'mutex_lock_release_failure'
 
 class DistributedMutex < Mutex
 
@@ -16,7 +17,8 @@ class DistributedMutex < Mutex
   end
 
   def lock
-    if @locked = get_lock
+    @locked = get_lock
+    if true == @locked
       true
     else
       if @exception_on_timeout
@@ -56,12 +58,12 @@ class DistributedMutex < Mutex
   end
 
   def unlock
-    if @locked
+    if locked?
       if release_lock
         @locked = false
         true
       else
-        false
+        raise MutexLockReleaseFailure
       end
     else
       false

data/lib/mutex_lock_release_failure.rb

@@ -0,0 +1,6 @@
+class MutexLockReleaseFailure < StandardError
+
+  def message
+    'Failed to release Mutex lock. This should be regarded as a system bug.'
+  end
+end

data/lib/mysql_mutex.rb

@@ -3,40 +3,82 @@ require 'distributed_mutex'
 
 class MySQLMutex < DistributedMutex
 
-  @active_locks = Hash.new
+  @@thread_locks = Hash.new { |h,k| h[k] = Hash.new(0) } # Accounting for nested locks.
 
   def initialize(key, timeout = DEFAULT_TIMEOUT, exception_on_timeout = DEFAULT_EXCEPTION_ON_TIMEOUT, connection = ActiveRecord::Base.connection)
+    super(key, timeout, exception_on_timeout)
     @connection = connection
-    @lock_was_free = false
-    @get_sql = ActiveRecord::Base.send(:sanitize_sql_array,["SELECT IS_FREE_LOCK(?), GET_LOCK(?,?)", key, key, timeout])
+    @connection_id = connection.show_variable('pseudo_thread_id')
+    @get_sql = ActiveRecord::Base.send(:sanitize_sql_array,["SELECT GET_LOCK(?,?)", key, timeout])
     @release_sql = ActiveRecord::Base.send(:sanitize_sql_array,["SELECT RELEASE_LOCK(?)", key])
-    super(key, timeout, exception_on_timeout)
-  end
-
-  def self.active_locks
-    @active_locks
   end
 
   def self.synchronize(key, timeout = DEFAULT_TIMEOUT, exception_on_timeout = DEFAULT_TIMEOUT, con = ActiveRecord::Base.connection, &block)
     mutex = new(key, timeout, exception_on_timeout, con)
-    @active_locks[key] = timeout
     mutex.synchronize(&block)
-    @active_locks.delete(key)
+  end
+
+  def self.active_locks
+    @@thread_locks
   end
 
   private
 
   def get_lock
-    is_free_lock, get_lock = @connection.select_rows(@get_sql).first
-    @lock_was_free = ('1' == is_free_lock)
-    '1' == get_lock
+    if thread_lock_count > 0
+      increment_thread_lock_count
+      true
+    else
+      get_lock = @connection.select_value(@get_sql)
+
+      if defined?(Rails)
+        Rails.logger.debug("MySQLMutex: GET_LOCK=#{get_lock}")
+      end
+
+      if '1' == get_lock
+        increment_thread_lock_count
+        true
+      else
+        false
+      end
+    end
   end
 
   def release_lock
-    if @lock_was_free
-      '1' == @connection.select_value(@release_sql)
-    else
+    if thread_lock_count > 1
+      decrement_thread_lock_count
       true
+    elsif thread_lock_count > 0
+      lock_release = @connection.select_value(@release_sql)
+
+      if defined?(Rails)
+        Rails.logger.debug("MySQLMutex: RELEASE_LOCK=#{lock_release}")
+      end
+
+      if '1' == lock_release
+        decrement_thread_lock_count
+        true
+      else
+        false
+      end
+    else
+      false
+    end
+  end
+
+  def thread_lock_count
+    @@thread_locks[@connection_id][self.key]
+  end
+
+  def increment_thread_lock_count
+    @@thread_locks[@connection_id][self.key] += 1
+  end
+
+  def decrement_thread_lock_count
+    @@thread_locks[@connection_id][self.key] -= 1
+
+    if 0 == @@thread_locks[@connection_id][self.key]
+      @@thread_locks[@connection_id].delete(self.key)
     end
   end
 
@@ -44,6 +86,10 @@ end
 
 at_exit do
   locks = MySQLMutex.active_locks
+  locks.delete_if do |k, v|
+    v.empty?
+  end
+
   if locks.size > 0
     if defined?(Rails)
       Rails.logger.error("MySQLMutex: Locks still active! - #{locks.inspect}")

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Birkir A. Barkarson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +09:00
+date: 2010-12-10 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - init.rb
 - lib/distributed_mutex.rb
 - lib/global_mutex.rb
+- lib/mutex_lock_release_failure.rb
 - lib/mutex_lock_timeout.rb
 - lib/mysql_mutex.rb
 - rails/init.rb