Merge pull request #61 from jdantonio/atomic_optimization

Atomic optimization

Author: jdantonio

lib/concurrent/atomic/atomic_fixnum.rb

@@ -28,9 +28,11 @@ def initialize(init = 0)
     #
     #   @return [Fixnum] the current value
     def value
-      @mutex.synchronize do
-        @value
-      end
+      @mutex.lock
+      result = @value
+      @mutex.unlock
+
+      result
     end
 
     # @!macro [attach] atomic_fixnum_method_value_eq
@@ -44,9 +46,11 @@ def value
     #   @raise [ArgumentError] if the new value is not a `Fixnum`
     def value=(value)
       raise ArgumentError.new('value must be a Fixnum') unless value.is_a?(Fixnum)
-      @mutex.synchronize do
-        @value = value
-      end
+      @mutex.lock
+      result = @value = value
+      @mutex.unlock
+
+      result
     end
 
     # @!macro [attach] atomic_fixnum_method_increment
@@ -55,10 +59,14 @@ def value=(value)
     #
     #   @return [Fixnum] the current value after incrementation
     def increment
-      @mutex.synchronize do
-        @value += 1
-      end
+      @mutex.lock
+      @value += 1
+      result = @value
+      @mutex.unlock
+
+      result
     end
+
     alias_method :up, :increment
 
     # @!macro [attach] atomic_fixnum_method_decrement
@@ -67,10 +75,14 @@ def increment
     #
     #   @return [Fixnum] the current value after decrementation
     def decrement
-      @mutex.synchronize do
-        @value -= 1
-      end
+      @mutex.lock
+      @value -= 1
+      result = @value
+      @mutex.unlock
+
+      result
     end
+
     alias_method :down, :decrement
 
     # @!macro [attach] atomic_fixnum_method_compare_and_set
@@ -83,14 +95,17 @@ def decrement
     #
     #   @return [Boolean] true if the value was updated else false 
     def compare_and_set(expect, update)
-      @mutex.synchronize do
-        if @value == expect
-          @value = update
-          true
-        else
-          false
-        end
+
+      @mutex.lock
+      if @value == expect
+        @value = update
+        result = true
+      else
+        result = false
       end
+      @mutex.unlock
+
+      result
     end
   end
 
@@ -124,13 +139,15 @@ def value=(value)
       def increment
         @atomic.increment_and_get
       end
+
       alias_method :up, :increment
 
       # @!macro atomic_fixnum_method_decrement
       #
       def decrement
         @atomic.decrement_and_get
       end
+
       alias_method :down, :decrement
 
       # @!macro atomic_fixnum_method_compare_and_set

lib/concurrent/atomic/event.rb

@@ -28,41 +28,52 @@ def initialize
     #
     # @return [Boolean] indicating whether or not the `Event` has been set
     def set?
-      @mutex.synchronize do
-        @set
-      end
+      @mutex.lock
+      result = @set
+      @mutex.unlock
+
+      result
     end
 
     # Trigger the event, setting the state to `set` and releasing all threads
     # waiting on the event. Has no effect if the `Event` has already been set.
     #
     # @return [Boolean] should always return `true`
     def set
-      @mutex.synchronize do
-        return true if @set
+      @mutex.lock
+      unless @set
         @set = true
         @condition.broadcast
       end
+      @mutex.unlock
 
       true
     end
 
     def try?
-      @mutex.synchronize do
-        return false if @set
+      @mutex.lock
+
+      if @set
+        result = false
+      else
         @set = true
         @condition.broadcast
+        result = true
       end
+
+      @mutex.unlock
+
+      result
     end
 
     # Reset a previously set event back to the `unset` state.
     # Has no effect if the `Event` has not yet been set.
     #
     # @return [Boolean] should always return `true`
     def reset
-      @mutex.synchronize do
-        @set = false
-      end
+      @mutex.lock
+      @set = false
+      @mutex.unlock
 
       true
     end
@@ -73,16 +84,20 @@ def reset
     #
     # @return [Boolean] true if the `Event` was set before timeout else false
     def wait(timeout = nil)
-      @mutex.synchronize do
-        return true if @set
+      @mutex.lock
 
+      unless @set
         remaining = Condition::Result.new(timeout)
         while !@set && remaining.can_wait?
           remaining = @condition.wait(@mutex, remaining.remaining_time)
         end
-
-        @set
       end
+
+      result = @set
+
+      @mutex.unlock
+
+      result
     end
   end
 end

spec/concurrent/atomic/atomic_fixnum_spec.rb

@@ -127,35 +127,40 @@ module Concurrent
     specify 'value is synchronized' do
       mutex = double('mutex')
       Mutex.stub(:new).with(no_args).and_return(mutex)
-      mutex.should_receive(:synchronize)
+      mutex.should_receive(:lock)
+      mutex.should_receive(:unlock)
       described_class.new.value
     end
 
     specify 'value= is synchronized' do
       mutex = double('mutex')
       Mutex.stub(:new).with(no_args).and_return(mutex)
-      mutex.should_receive(:synchronize)
+      mutex.should_receive(:lock)
+      mutex.should_receive(:unlock)
       described_class.new.value = 10
     end
 
     specify 'increment is synchronized' do
       mutex = double('mutex')
       Mutex.stub(:new).with(no_args).and_return(mutex)
-      mutex.should_receive(:synchronize)
+      mutex.should_receive(:lock)
+      mutex.should_receive(:unlock)
       described_class.new.increment
     end
 
     specify 'decrement is synchronized' do
       mutex = double('mutex')
       Mutex.stub(:new).with(no_args).and_return(mutex)
-      mutex.should_receive(:synchronize)
+      mutex.should_receive(:lock)
+      mutex.should_receive(:unlock)
       described_class.new.decrement
     end
 
     specify 'compare_and_set is synchronized' do
       mutex = double('mutex')
       Mutex.stub(:new).with(no_args).and_return(mutex)
-      mutex.should_receive(:synchronize)
+      mutex.should_receive(:lock)
+      mutex.should_receive(:unlock)
       described_class.new(14).compare_and_set(14, 2)
     end
   end