atomic 0.0.1 → 0.0.2

data/atomic.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{atomic}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.authors = ["Charles Oliver Nutter", "MenTaLguY"]
   s.date = Time.now.strftime('YYYY-MM-DD')
   s.description = "An atomic reference implementation for JRuby and green or GIL-threaded impls"

data/lib/atomic.rb

@@ -1,4 +1,6 @@
-base_atomic = Class.new do
+require 'thread'
+
+class Atomic
   class ConcurrentUpdateError < ThreadError
   end
   
@@ -38,42 +40,23 @@ end
 
 if defined? RUBY_ENGINE && RUBY_ENGINE == "jruby"
   require 'java'
-  Atomic = Class.new(base_atomic) do
-    InternalReference = java.util.concurrent.atomic.AtomicReference
-  end
+  Atomic::InternalReference = java.util.concurrent.atomic.AtomicReference
 else
-  Atomic = Class.new(base_atomic) do
-    class InternalReference
-      attr_accessor :value
-      alias_method :get, :value
-      alias_method :set, :value=
+  class Atomic::InternalReference
+    attr_accessor :value
+    alias_method :get, :value
+    alias_method :set, :value=
 
-      def initialize(value)
-        @value = value
-      end
+    def initialize(value)
+      @value = value
+    end
 
-      def compare_and_set(old_value, new_value)
-        _exclusive do
-          return false unless @value.equal? old_value
-          @value = new_value
-        end
-        true
-      end
-      
-      HAS_EXCLUSIVE = defined? Thread.exclusive
-      def _exclusive
-        if HAS_EXCLUSIVE
-          Thread.exclusive {yield}
-        else
-          begin
-            Thread.critical = true
-            yield
-          ensure
-            Thread.critical = false
-          end
-        end
+    def compare_and_set(old_value, new_value)
+      Thread.exclusive do 
+        return false unless @value.equal? old_value
+        @value = new_value
       end
-      private :_exclusive
+      true
     end
   end
-end
+end

data/test/test_atomic.rb

@@ -19,17 +19,33 @@ class TestAtomic < Test::Unit::TestCase
   
   def test_update
     atomic = Atomic.new(0)
-    atomic.update {|v| v + 1}
+    res = atomic.update {|v| v + 1}
     
     assert_equal 1, atomic.value
+    assert_equal 0, res
   end
   
   def test_try_update
     atomic = Atomic.new(0)
-    atomic.try_update {|v| v + 1}
+    res = atomic.try_update {|v| v + 1}
     
     assert_equal 1, atomic.value
+    assert_equal 0, res
   end
   
-  # TODO: Test the ConcurrentUpdateError cases
-end
+  def test_try_update_fails
+    atomic = Atomic.new(0)
+    assert_raise Atomic::ConcurrentUpdateError do
+      # assigning within block exploits implementation detail for test
+      atomic.try_update{|v| atomic.value = 1 ; v + 1}
+    end
+  end
+
+  def test_update_retries
+    tries = 0
+    atomic = Atomic.new(0)
+    # assigning within block exploits implementation detail for test
+    atomic.update{|v| tries += 1 ; atomic.value = 1 ; v + 1}
+    assert_equal 2, tries
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 1
-  version: 0.0.1
+    - 2
+  version: 0.0.2
 platform: ruby
 authors: 
   - Charles Oliver Nutter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:03:10.533000 -04:00
+date: 2010-06-08 00:29:12.585000 -04:00
 default_executable: 
 dependencies: []