Changed every mutex.lock - mutex.unlock pair to ensure mutex release even with errors

closes #79

Author: mighe

lib/concurrent/agent.rb

@@ -113,10 +113,14 @@ def rescue(clazz = StandardError, &block)
     # @yieldparam [Object] value the result of the last update operation
     # @yieldreturn [Boolean] true if the value is valid else false
     def validate(&block)
+
       unless block.nil?
-        mutex.lock
-        @validator = block
-        mutex.unlock
+        begin
+          mutex.lock
+          @validator = block
+        ensure
+          mutex.unlock
+        end
       end
       self
     end
@@ -205,12 +209,15 @@ def work(&handler) # :nodoc:
         exception = ex
       end
 
-      mutex.lock
-      should_notify = if !exception && valid
-                        @value = result
-                        true
-                      end
-      mutex.unlock
+      begin
+        mutex.lock
+        should_notify = if !exception && valid
+                          @value = result
+                          true
+                        end
+      ensure
+        mutex.unlock
+      end
 
       if should_notify
         time = Time.now

lib/concurrent/atomic/atomic.rb

@@ -9,40 +9,36 @@ def initialize(init = nil)
 
     def value
       @mutex.lock
-      result = @value
+      @value
+    ensure
       @mutex.unlock
-
-      result
     end
 
     def value=(value)
       @mutex.lock
-      result = @value = value
+      @value = value
+    ensure
       @mutex.unlock
-
-      result
     end
 
     def modify
       @mutex.lock
       result = yield @value
       @value = result
+    ensure
       @mutex.unlock
-
-      result
     end
 
     def compare_and_set(expect, update)
       @mutex.lock
       if @value == expect
         @value = update
-        result = true
+        true
       else
-        result = false
+        false
       end
+    ensure
       @mutex.unlock
-
-      result
     end
   end
 

lib/concurrent/atomic/atomic_boolean.rb

@@ -27,9 +27,9 @@ def initialize(initial = false)
     #   @return [Boolean] the current value
     def value
       @mutex.lock
-      result = @value
+      @value
+    ensure
       @mutex.unlock
-      result
     end
 
     # @!macro [attach] atomic_boolean_method_value_eq
@@ -42,9 +42,9 @@ def value
     def value=(value)
       @mutex.lock
       @value = !!value
-      result = @value
+      @value
+    ensure
       @mutex.unlock
-      result
     end
 
     # @!macro [attach] atomic_boolean_method_is_true
@@ -54,9 +54,9 @@ def value=(value)
     #   @return [Boolean] true if the current value is `true`, else false
     def true?
       @mutex.lock
-      result = @value
+      @value
+    ensure
       @mutex.unlock
-      result
     end
 
     # @!macro [attach] atomic_boolean_method_is_false
@@ -66,9 +66,9 @@ def true?
     #   @return [Boolean] true if the current value is `false`, else false
     def false?
       @mutex.lock
-      result = !@value
+      !@value
+    ensure
       @mutex.unlock
-      result
     end
 
     # @!macro [attach] atomic_boolean_method_make_true
@@ -80,9 +80,9 @@ def make_true
       @mutex.lock
       old = @value
       @value = true
-      @mutex.unlock
-
       !old
+    ensure
+      @mutex.unlock
     end
 
     # @!macro [attach] atomic_boolean_method_make_false
@@ -94,9 +94,9 @@ def make_false
       @mutex.lock
       old = @value
       @value = false
-      @mutex.unlock
-
       old
+    ensure
+      @mutex.unlock
     end
   end
 

lib/concurrent/atomic/atomic_fixnum.rb

@@ -29,10 +29,9 @@ def initialize(init = 0)
     #   @return [Fixnum] the current value
     def value
       @mutex.lock
-      result = @value
+      @value
+    ensure
       @mutex.unlock
-
-      result
     end
 
     # @!macro [attach] atomic_fixnum_method_value_eq
@@ -47,10 +46,9 @@ def value
     def value=(value)
       raise ArgumentError.new('value must be a Fixnum') unless value.is_a?(Fixnum)
       @mutex.lock
-      result = @value = value
+      @value = value
+    ensure
       @mutex.unlock
-
-      result
     end
 
     # @!macro [attach] atomic_fixnum_method_increment
@@ -61,10 +59,8 @@ def value=(value)
     def increment
       @mutex.lock
       @value += 1
-      result = @value
+    ensure
       @mutex.unlock
-
-      result
     end
 
     alias_method :up, :increment
@@ -77,10 +73,8 @@ def increment
     def decrement
       @mutex.lock
       @value -= 1
-      result = @value
+    ensure
       @mutex.unlock
-
-      result
     end
 
     alias_method :down, :decrement
@@ -98,13 +92,12 @@ def compare_and_set(expect, update)
       @mutex.lock
       if @value == expect
         @value = update
-        result = true
+        true
       else
-        result = false
+        false
       end
+    ensure
       @mutex.unlock
-
-      result
     end
   end
 

lib/concurrent/atomic/copy_on_notify_observer_set.rb

@@ -28,11 +28,14 @@ def add_observer(observer=nil, func=:update, &block)
         func = :call
       end
 
-      @mutex.lock
-      @observers[observer] = func
-      @mutex.unlock
+      begin
+        @mutex.lock
+        @observers[observer] = func
+      ensure
+        @mutex.unlock
+      end
 
-      observer
+        observer
     end
 
     # @param [Object] observer the observer to remove

lib/concurrent/atomic/copy_on_write_observer_set.rb

@@ -27,13 +27,15 @@ def add_observer(observer=nil, func=:update, &block)
         func = :call
       end
 
-      @mutex.lock
-      new_observers = @observers.dup
-      new_observers[observer] = func
-      @observers = new_observers
-      @mutex.unlock
-
-      observer
+      begin
+        @mutex.lock
+        new_observers = @observers.dup
+        new_observers[observer] = func
+        @observers = new_observers
+        observer
+      ensure
+        @mutex.unlock
+      end
     end
 
     # @param [Object] observer the observer to remove
@@ -43,9 +45,9 @@ def delete_observer(observer)
       new_observers = @observers.dup
       new_observers.delete(observer)
       @observers = new_observers
-      @mutex.unlock
-
       observer
+    ensure
+      @mutex.unlock
     end
 
     # Deletes all observers
@@ -91,25 +93,25 @@ def notify_to(observers, *args)
 
     def observers
       @mutex.lock
-      o = @observers
+      @observers
+    ensure
       @mutex.unlock
-
-      o
     end
 
     def observers=(new_set)
       @mutex.lock
       @observers = new_set
+    ensure
       @mutex.unlock
     end
 
     def clear_observers_and_return_old
       @mutex.lock
       old_observers = @observers
       @observers = {}
-      @mutex.unlock
-
       old_observers
+    ensure
+      @mutex.unlock
     end
   end
 end

lib/concurrent/atomic/event.rb

@@ -29,10 +29,9 @@ def initialize
     # @return [Boolean] indicating whether or not the `Event` has been set
     def set?
       @mutex.lock
-      result = @set
+      @set
+    ensure
       @mutex.unlock
-
-      result
     end
 
     # Trigger the event, setting the state to `set` and releasing all threads
@@ -45,25 +44,24 @@ def set
         @set = true
         @condition.broadcast
       end
-      @mutex.unlock
-
       true
+    ensure
+      @mutex.unlock
     end
 
     def try?
       @mutex.lock
 
       if @set
-        result = false
+        false
       else
         @set = true
         @condition.broadcast
-        result = true
+        true
       end
 
+    ensure
       @mutex.unlock
-
-      result
     end
 
     # Reset a previously set event back to the `unset` state.
@@ -73,9 +71,9 @@ def try?
     def reset
       @mutex.lock
       @set = false
-      @mutex.unlock
-
       true
+    ensure
+      @mutex.unlock
     end
 
     # Wait a given number of seconds for the `Event` to be set by another
@@ -93,11 +91,9 @@ def wait(timeout = nil)
         end
       end
 
-      result = @set
-
+      @set
+    ensure
       @mutex.unlock
-
-      result
     end
   end
 end

lib/concurrent/delay.rb

@@ -73,10 +73,9 @@ def initialize(opts = {}, &block)
     def value
       mutex.lock
       execute_task_once
-      result = apply_deref_options(@value)
+      apply_deref_options(@value)
+    ensure
       mutex.unlock
-
-      result
     end
 
     private