atomic 1.1.14 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aad6e8fcd730576258b61e5d55b5025b2b48e4b8
-  data.tar.gz: 866cfa7563c4712d30582c20234fefb6bfa2e26e
+  metadata.gz: 960495c0246177f5b31a0a21f15a0e22d61b40ae
+  data.tar.gz: beff1839c55b014a2cb74a37db338db823db53f0
 SHA512:
-  metadata.gz: bff4c0711a3196ec7cdd8a8a09cf2de07986ccbcf6a8048197f464762972a015a0a6635c9b47f2f6636242b4145c87ca131706c3d24591aacae2ea73c169ff2b
-  data.tar.gz: d3d1a084b48fde881006f43b8f954ee4593bc919c9c77e912102c7b84bdcfac1da5839fbd46b096b14d418f7264505b202f2f4d2ec5c65f002e605cd31b61b48
+  metadata.gz: bd632983d6ebc30d757bde26a94b66b719d64edb0e45c8c9c383e2742efe283966fca3ffa40d5e4c145a20c2d177e146beae3057cd70ecf65514ab4013d9afa4
+  data.tar.gz: 5f94bad1e38a1de11f3e47025a889eb73056055cc069beb84a189fcdb43b1014be7c432f0a6658ef8c6aaf6a10a35e2864f69dbfe974ea5e88726ad6fe69d03f

data/.travis.yml

@@ -3,8 +3,8 @@ rvm:
   - 2.0.0
   - 1.9.3
   - 1.8.7
-# Because we need JDK8 to build, these are disabled temporarily
-#  - jruby-18mode # JRuby in 1.8 mode
-#  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-2
+jdk:
+  - oraclejdk8

data/Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem 'rake-compiler'
+gem 'minitest', :group => :development

data/README.md

@@ -9,8 +9,8 @@ This library provides:
 
 The Atomic class provides accessors for the contained "value" plus two update methods:
 
-* update will run the provided block, passing the current value and replacing it with the block result iff the value has not been changed in the mean time. It may run the block repeatedly if there are other concurrent updates in progress.
-* try_update will run the provided block, passing the current value and replacing it with the block result. If the value changes before the update can happen, it will throw Atomic::ConcurrentUpdateError.
+* update will run the provided block, passing the current value and replacing it with the block result if the value has not been changed in the meantime. It may run the block repeatedly if there are other concurrent updates in progress.
+* try_update will run the provided block, passing the current value and replacing it with the block result. If the value changes before the update can happen, it will throw an Atomic::ConcurrentUpdateError.
 
 The atomic repository is at http://github.com/headius/ruby-atomic.
 
@@ -21,24 +21,28 @@ The simplest way to use "atomic" is to call the "update" or "try_update" methods
 
 "try_update" and "update" both call the given block, passing the current value and using the block's result as the new value. If the value is updated by another thread before the block completes, "try update" raises a ConcurrentUpdateError and "update" retries the block. Because "update" may call the block several times when multiple threads are all updating the same value, the block's logic should be kept as simple as possible.
 
-    require 'atomic'
+```ruby
+require 'atomic'
 
-    my_atomic = Atomic.new(0)
-    my_atomic.update {|v| v + 1}
-    begin
-      my_atomic.try_update {|v| v + 1}
-    rescue Atomic::ConcurrentUpdateError => cue
-      # deal with it (retry, propagate, etc)
-    end
+my_atomic = Atomic.new(0)
+my_atomic.update {|v| v + 1}
+begin
+  my_atomic.try_update {|v| v + 1}
+rescue Atomic::ConcurrentUpdateError => cue
+  # deal with it (retry, propagate, etc)
+end
+```
 
 It's also possible to use the regular get/set operations on the Atomic, if you want to avoid the exception and respond to contended changes in some other way.
 
-    my_atomic = Atomic.new(0)
-    my_atomic.value # => 0
-    my_atomic.value = 1
-    my_atomic.swap(2) # => 1
-    my_atomic.compare_and_swap(2, 3) # => true, updated to 3
-    my_atomic.compare_and_swap(2, 3) # => false, current is not 2
+```ruby
+my_atomic = Atomic.new(0)
+my_atomic.value # => 0
+my_atomic.value = 1
+my_atomic.swap(2) # => 1
+my_atomic.compare_and_swap(2, 3) # => true, updated to 3
+my_atomic.compare_and_swap(2, 3) # => false, current is not 2
+```
 
 Building
 ========

data/Rakefile

@@ -39,27 +39,25 @@ if defined?(JRUBY_VERSION)
   end
 
   desc "Compile the extension"
-  task :compile => "pkg/classes" do |t|
+  task :compile_java => "pkg/classes" do |t|
     ant.javac :srcdir => "ext", :destdir => t.prerequisites.first,
       :source => "1.5", :target => "1.5", :debug => true,
       :classpath => "${java.class.path}:${sun.boot.class.path}"
   end
 
   desc "Build the jar"
-  task :jar => :compile do
+  task :jar => :compile_java do
     ant.jar :basedir => "pkg/classes", :destfile => "lib/atomic_reference.jar", :includes => "**/*.class"
   end
 
-  task :package => :jar
+  task :compile => :jar
 else
-  task :package do
-    Dir.chdir("ext") do
-      # this does essentially the same thing
-      # as what RubyGems does
-      ruby "extconf.rb"
-      sh "make"
-    end
+  require "rake/extensiontask"
+  Rake::ExtensionTask.new "atomic" do |ext|
+    ext.ext_dir = 'ext'
+    ext.name ='atomic_reference'
   end
 end
 
-task :test => :package
+task :package => :compile
+task :test => :compile

data/atomic.gemspec

@@ -4,7 +4,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{atomic}
-  s.version = "1.1.14"
+  s.version = "1.1.15"
   s.authors = ["Charles Oliver Nutter", "MenTaLguY", "Sokolov Yura"]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.summary = "An atomic reference implementation for JRuby, Rubinius, and MRI"

data/ext/atomic_reference.c

@@ -15,6 +15,10 @@
 #include <atomic.h>
 #endif
 
+#ifdef HAVE_LIBKERN_OSATOMIC_H
+#include <libkern/OSAtomic.h>
+#endif
+
 static void ir_mark(void *value) {
     rb_gc_mark_maybe((VALUE) value);
 }
@@ -67,12 +71,18 @@ static VALUE ir_compare_and_set(volatile VALUE self, VALUE expect_value, VALUE n
         return Qtrue;
     }
 #endif
-#elif HAVE_GCC_CAS
-    if (__sync_bool_compare_and_swap(&DATA_PTR(self), expect_value, new_value)) {
+#elif defined _MSC_VER && defined _M_AMD64
+    if (InterlockedCompareExchange64((LONGLONG*)&DATA_PTR(self), new_value, expect_value)) {
+	return Qtrue;
+    }
+#elif defined _MSC_VER && defined _M_IX86
+    if (InterlockedCompareExchange((LONG*)&DATA_PTR(self), new_value, expect_value)) {
 	return Qtrue;
     }
 #else
-#error No CAS operation available for this platform
+    if (__sync_bool_compare_and_swap(&DATA_PTR(self), expect_value, new_value)) {
+	return Qtrue;
+    }
 #endif
     return Qfalse;
 }

data/ext/extconf.rb

@@ -14,6 +14,8 @@ require 'mkmf'
 extension_name = 'atomic_reference'
 dir_config(extension_name)
 
+have_header "libkern/OSAtomic.h"
+
 if CONFIG["GCC"] && CONFIG["GCC"] != ""
   case CONFIG["arch"]
   when /mswin32|mingw|solaris/

data/test/test_atomic.rb

@@ -10,10 +10,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'atomic'
 
-class TestAtomic < Test::Unit::TestCase
+class TestAtomic < MiniTest::Test
   def test_construct
     atomic = Atomic.new
     assert_equal nil, atomic.value
@@ -58,7 +58,7 @@ class TestAtomic < Test::Unit::TestCase
   def test_try_update_fails
     # use a number outside JRuby's fixnum cache range, to ensure identity is preserved
     atomic = Atomic.new(1000)
-    assert_raise Atomic::ConcurrentUpdateError do
+    assert_raises Atomic::ConcurrentUpdateError do
       # assigning within block exploits implementation detail for test
       atomic.try_update{|v| atomic.value = 1001 ; v + 1}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atomic
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.15
 platform: ruby
 authors:
 - Charles Oliver Nutter
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies: []
 description: An atomic reference implementation for JRuby, Rubinius, and MRI
 email:
@@ -22,10 +22,9 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- test/test_atomic.rb
-- ext/extconf.rb
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -36,6 +35,7 @@ files:
 - examples/graph_atomic_bench.rb
 - ext/AtomicReferenceService.java
 - ext/atomic_reference.c
+- ext/extconf.rb
 - ext/org/jruby/ext/atomic/AtomicReferenceLibrary.java
 - lib/atomic.rb
 - lib/atomic/concurrent_update_error.rb
@@ -46,6 +46,7 @@ files:
 - lib/atomic/numeric_cas_wrapper.rb
 - lib/atomic/rbx.rb
 - lib/atomic/ruby.rb
+- test/test_atomic.rb
 homepage: http://github.com/headius/ruby-atomic
 licenses:
 - Apache-2.0
@@ -56,19 +57,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: An atomic reference implementation for JRuby, Rubinius, and MRI
 test_files:
 - test/test_atomic.rb
+has_rdoc: