AtomicFixnum is now a Synchronization::Object.

Author: jdantonio

examples/benchmark_atomic_fixnum.rb

@@ -6,6 +6,9 @@
 require 'benchmark'
 require 'rbconfig'
 
+THREADS = 1
+TESTS = 10_000_000
+
 def atomic_test(clazz, opts = {})
   threads = opts.fetch(:threads, 5)
   tests = opts.fetch(:tests, 100)
@@ -29,10 +32,10 @@ def atomic_test(clazz, opts = {})
 
 puts "Testing with #{RbConfig::CONFIG['ruby_install_name']} #{RUBY_VERSION}"
 
-atomic_test(Concurrent::MutexAtomicFixnum, threads: 10, tests: 1_000_000)
+atomic_test(Concurrent::MutexAtomicFixnum, threads: THREADS, tests: TESTS)
 
 if defined? Concurrent::CAtomicFixnum
-  atomic_test(Concurrent::CAtomicFixnum, threads: 10, tests: 1_000_000)
+  atomic_test(Concurrent::CAtomicFixnum, threads: THREADS, tests: TESTS)
 elsif RUBY_PLATFORM == 'java'
-  atomic_test(Concurrent::JavaAtomicFixnum, threads: 10, tests: 1_000_000)
+  atomic_test(Concurrent::JavaAtomicFixnum, threads: THREADS, tests: TESTS)
 end

lib/concurrent/atomic/atomic_fixnum.rb

@@ -1,4 +1,5 @@
 require 'concurrent/native_extensions'
+require 'concurrent/synchronization'
 
 module Concurrent
 
@@ -21,7 +22,7 @@ module Concurrent
   #         4.520000   0.030000   4.550000 (  1.187000)
   #
   #   @see http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/AtomicLong.html java.util.concurrent.atomic.AtomicLong
-  class MutexAtomicFixnum
+  class MutexAtomicFixnum < Synchronization::Object
 
     # http://stackoverflow.com/questions/535721/ruby-max-integer
     MIN_VALUE = -(2**(0.size * 8 - 2))
@@ -33,10 +34,9 @@ class MutexAtomicFixnum
     #
     #   @param [Fixnum] init the initial value
     #   @raise [ArgumentError] if the initial value is not a `Fixnum`
-    def initialize(init = 0)
-      raise ArgumentError.new('initial value must be a Fixnum') unless init.is_a?(Fixnum)
-      @value = init
-      @mutex = Mutex.new
+    def initialize(initial = 0)
+      raise ArgumentError.new('initial value must be a Fixnum') unless initial.is_a?(Fixnum)
+      super(initial)
     end
 
     # @!macro [attach] atomic_fixnum_method_value_get
@@ -45,10 +45,7 @@ def initialize(init = 0)
     #
     #   @return [Fixnum] the current value
     def value
-      @mutex.lock
-      @value
-    ensure
-      @mutex.unlock
+      synchronize { @value }
     end
 
     # @!macro [attach] atomic_fixnum_method_value_set
@@ -62,10 +59,7 @@ 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.lock
-      @value = value
-    ensure
-      @mutex.unlock
+      synchronize { @value = value }
     end
 
     # @!macro [attach] atomic_fixnum_method_increment
@@ -74,10 +68,7 @@ def value=(value)
     #
     #   @return [Fixnum] the current value after incrementation
     def increment
-      @mutex.lock
-      @value += 1
-    ensure
-      @mutex.unlock
+      synchronize { @value += 1 }
     end
 
     alias_method :up, :increment
@@ -88,10 +79,7 @@ def increment
     #
     #   @return [Fixnum] the current value after decrementation
     def decrement
-      @mutex.lock
-      @value -= 1
-    ensure
-      @mutex.unlock
+      synchronize { @value -= 1 }
     end
 
     alias_method :down, :decrement
@@ -106,15 +94,20 @@ def decrement
     #
     #   @return [Boolean] true if the value was updated else false
     def compare_and_set(expect, update)
-      @mutex.lock
-      if @value == expect
-        @value = update
-        true
-      else
-        false
+      synchronize do
+        if @value == expect
+          @value = update
+          true
+        else
+          false
+        end
       end
-    ensure
-      @mutex.unlock
+    end
+
+    protected
+
+    def ns_initialize(initial)
+      @value = initial
     end
   end
 

spec/concurrent/atomic/atomic_fixnum_spec.rb

@@ -116,50 +116,31 @@ module Concurrent
 
     it_should_behave_like :atomic_fixnum
 
-    specify 'construction is synchronized' do
-      mutex = double('mutex')
-      expect(Mutex).to receive(:new).once.with(no_args).and_return(mutex)
-      described_class.new
-    end
-
-    specify 'value is synchronized' do
-      mutex = double('mutex')
-      allow(Mutex).to receive(:new).with(no_args).and_return(mutex)
-      expect(mutex).to receive(:lock)
-      expect(mutex).to receive(:unlock)
-      described_class.new.value
-    end
-
-    specify 'value= is synchronized' do
-      mutex = double('mutex')
-      allow(Mutex).to receive(:new).with(no_args).and_return(mutex)
-      expect(mutex).to receive(:lock)
-      expect(mutex).to receive(:unlock)
-      described_class.new.value = 10
-    end
-
-    specify 'increment is synchronized' do
-      mutex = double('mutex')
-      allow(Mutex).to receive(:new).with(no_args).and_return(mutex)
-      expect(mutex).to receive(:lock)
-      expect(mutex).to receive(:unlock)
-      described_class.new.increment
-    end
-
-    specify 'decrement is synchronized' do
-      mutex = double('mutex')
-      allow(Mutex).to receive(:new).with(no_args).and_return(mutex)
-      expect(mutex).to receive(:lock)
-      expect(mutex).to receive(:unlock)
-      described_class.new.decrement
-    end
-
-    specify 'compare_and_set is synchronized' do
-      mutex = double('mutex')
-      allow(Mutex).to receive(:new).with(no_args).and_return(mutex)
-      expect(mutex).to receive(:lock)
-      expect(mutex).to receive(:unlock)
-      described_class.new(14).compare_and_set(14, 2)
+    context 'instance methods' do
+
+      before(:each) do
+        expect(subject).to receive(:synchronize).with(no_args).and_return(10)
+      end
+
+      specify 'value is synchronized' do
+        subject.value
+      end
+
+      specify 'value= is synchronized' do
+        subject.value = 10
+      end
+
+      specify 'increment is synchronized' do
+        subject.increment
+      end
+
+      specify 'decrement is synchronized' do
+        subject.decrement
+      end
+
+      specify 'compare_and_set is synchronized' do
+        subject.compare_and_set(14, 2)
+      end
     end
   end