atomic 1.1.16-java → 1.1.99-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22229af5fc28a276c0dff9078d7af61876876425
-  data.tar.gz: 42a6e4c04e05ae1e22cfd60b716396fd4ee53336
+  metadata.gz: fbad1a0ae7343621cc423b8fb3de68c1215f56eb
+  data.tar.gz: 195eff42e12848cabb09b953d7a20be891778b83
 SHA512:
-  metadata.gz: fa3e4fee24583ea8e58b9f93854ddcfbe872e855b3830ad231c292398cfcf0d97af77664da055a2b110e1ba5df1d271ea7060477895e86e35be5fa25cba0b428
-  data.tar.gz: 100b290509c6e7d6598c96c9908420fe1e4617e03b312524b38e3550427a7ff61b97d6f739f4a4ea47e8fd3137498a75bc15cc08380a4f2566295465d0d6aded
+  metadata.gz: f5b70e8af28b679b640fcc8dfdc6128817ecf0f34b287734c00eee5aa887d447f853fd3ddfd2f8e1428900aaaf9aff48d959a401bca3f93a4886b494690b0d94
+  data.tar.gz: ccebeca5cdeb0127cff79d414078e12a7bba6b9459facb396820b182b44c8a664299c63bb6ff8e43f06dcc794f282066ec2e7deeecaadd2f8efc10790f7e43ea

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: YHujQy7tqpw5P0TuWjwk6Vd5Vuw8LcGvo

data/.gitignore

@@ -1,8 +1,37 @@
-.*.sw?
-lib/atomic_reference.jar
-/nbproject
-ext/*.bundle
-ext/*.so
-ext/*.jar
+Gemfile.lock
+*.gem
+lib/1.8
+lib/1.9
+lib/2.0
+.rvmrc
+.ruby-version
+.ruby-gemset
+.bundle/*
+.yardoc/*
+yardoc/*
+tmp/*
+man/*
+*.tmproj
+rdoc/*
+*.orig
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+*.REMOTE.*
+git_pull.txt
+coverage
+critic
+.DS_Store
+TAGS
+tmtags
+*.sw?
+.idea
+.rbx/*
+lib/**/*.bundle
+lib/**/*.so
+lib/**/*.jar
+ext/**/*.bundle
+ext/**/*.so
+ext/**/*.jar
 pkg
 *.gem

data/.travis.yml

@@ -1,10 +1,27 @@
 language: ruby
+
 rvm:
+  - 2.2.0
+  - 2.1.5
+  - 2.1.4
   - 2.0.0
   - 1.9.3
-  - 1.8.7
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
+  - ruby-head
+  - jruby-1.7.18
+  - jruby-head
   - rbx-2
+
 jdk:
   - oraclejdk8
+
+sudo: false
+
+branches:
+  only:
+    - master
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: 1.9.3

data/Gemfile

@@ -1,4 +1,12 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem 'rake-compiler'
-gem 'minitest', :group => :development
+gemspec
+
+group :development do
+  gem 'rake', '~> 10.3.2'
+  gem 'rake-compiler', '~> 0.9.2'
+end
+
+group :testing do
+  gem 'minitest', '>= 5.0.0', :group => :development
+end

data/README.md

@@ -1,10 +1,35 @@
-atomic: An atomic reference implementation for JRuby, Rubinius, and MRI.
-========================================================================
+# Ruby Atomic
 
-[![Build Status](https://travis-ci.org/headius/ruby-atomic.png?branch=master)](https://travis-ci.org/headius/ruby-atomic)
+[![Gem Version](https://badge.fury.io/rb/atomic.svg)](http://badge.fury.io/rb/atomic) [![Build Status](https://travis-ci.org/ruby-concurrency/atomic.svg?branch=master)](https://travis-ci.org/ruby-concurrency/atomic) [![Code Climate](https://codeclimate.com/github/ruby-concurrency/atomic.svg)](https://codeclimate.com/github/ruby-concurrency/atomic) [![Dependency Status](https://gemnasium.com/ruby-concurrency/atomic.svg)](https://gemnasium.com/ruby-concurrency/atomic) [![License](https://img.shields.io/badge/license-Apache-green.svg)](http://opensource.org/licenses/Apache-2.0) [![Gitter chat](http://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/ruby-concurrency/concurrent-ruby)
 
-Summary
-=======
+An atomic reference implementation for JRuby, Rubinius, and MRI.
+
+# Deprecated!
+
+*This gem has been deprecated in lieu of [Concurrent Ruby](http://www.concurrent-ruby.com).
+This gem will be retained in GitHUb and Rubygems.org indefinitely but no new development
+will occur, including updates to support new versions of Ruby, JRuby, and Java. All users
+of this gem are encouraged to update their projects to use `concurrent-ruby` instead.*
+
+All code from this gem has been merged into `concurrent-ruby` and its companion gems.
+All abstrations in this library are available in `concurrent-ruby` but have been moved
+under the `Concurrent` module to avoid namespace collisions.
+
+```ruby
+# old way
+require 'atomic'
+my_atomic = Atomic.new(0)
+
+# new way
+require 'concurrent'
+my_atomic = Concurrent::Atomic.new(0)
+```
+
+# Old Documentation
+
+*For historic purposes only...*
+
+## Summary
 
 This library provides:
 
@@ -15,10 +40,9 @@ The Atomic class provides accessors for the contained "value" plus two update me
 * 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.
+The atomic repository is at http://github.com/ruby-concurrency/ruby-atomic.
 
-Usage
-=====
+## Usage
 
 The simplest way to use "atomic" is to call the "update" or "try_update" methods.
 
@@ -47,7 +71,6 @@ my_atomic.compare_and_swap(2, 3) # => true, updated to 3
 my_atomic.compare_and_swap(2, 3) # => false, current is not 2
 ```
 
-Building
-========
+## Building
 
 As of 1.1.0, JDK8 is required to build the atomic gem, since it attempts to use the new atomic Unsafe.getAndSetObject method only in JDK8. The resulting code should still work fine as far back as Java 5.

data/Rakefile

@@ -13,8 +13,6 @@
 require 'rake'
 require 'rake/testtask'
 
-task :default => :test
-
 desc "Run tests"
 Rake::TestTask.new :test do |t|
   t.libs << "lib"
@@ -61,3 +59,5 @@ end
 
 task :package => :compile
 task :test => :compile
+
+task :default => :test

data/atomic.gemspec

@@ -4,13 +4,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{atomic}
-  s.version = "1.1.16"
+  s.version = "1.1.99"
   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"
   s.description = s.summary
   s.email = ["headius@headius.com", "mental@rydia.net", "funny.falcon@gmail.com"]
-  s.homepage = "http://github.com/headius/ruby-atomic"
+  s.homepage = "http://github.com/ruby-concurrency/ruby-atomic"
   s.require_paths = ["lib"]
   s.licenses = ["Apache-2.0"]
   s.test_files = Dir["test/test*.rb"]
@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
     s.extensions = 'ext/extconf.rb'
   end
   s.files += `git ls-files`.lines.map(&:chomp)
+  s.post_install_message = 'This gem has been deprecated and merged into Concurrent Ruby (http://concurrent-ruby.com).'
 end

data/ext/atomic_reference.c

@@ -37,18 +37,31 @@ static VALUE ir_initialize(int argc, VALUE* argv, VALUE self) {
 }
 
 static VALUE ir_get(VALUE self) {
+#if HAVE_GCC_SYNC
+    __sync_synchronize();
+#elif defined _MSC_VER
+    MemoryBarrier();
+#elif __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
+    OSMemoryBarrier();
+#endif
     return (VALUE) DATA_PTR(self);
 }
 
 static VALUE ir_set(VALUE self, VALUE new_value) {
     DATA_PTR(self) = (void *) new_value;
+#if HAVE_GCC_SYNC
+    __sync_synchronize();
+#elif defined _MSC_VER
+    MemoryBarrier();
+#elif __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
+    OSMemoryBarrier();
+#endif
     return new_value;
 }
 
 static VALUE ir_get_and_set(VALUE self, VALUE new_value) {
-    VALUE old_value;
-    old_value = (VALUE) DATA_PTR(self);
-    DATA_PTR(self) = (void *) new_value;
+    VALUE old_value = ir_get(self);
+    ir_set(self, new_value);
     return old_value;
 }
 

data/ext/extconf.rb

@@ -37,11 +37,10 @@ if compiler_is_gcc
   end
 end
 
-try_run(<<CODE,$CFLAGS) && ($defs << '-DHAVE_GCC_CAS')
+try_run(<<CODE,$CFLAGS) && ($defs << '-DHAVE_GCC_SYNC')
 int main() {
-  int i = 1;
-  __sync_bool_compare_and_swap(&i, 1, 4);
-  return (i != 4);
+  __sync_synchronize();
+  return 0;
 }
 CODE
 

data/test/test_atomic.rb

@@ -13,7 +13,7 @@
 require 'minitest/autorun'
 require 'atomic'
 
-class TestAtomic < MiniTest::Test
+class TestAtomic < Minitest::Test
   def test_construct
     atomic = Atomic.new
     assert_equal nil, atomic.value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atomic
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.1.99
 platform: java
 authors:
 - Charles Oliver Nutter
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies: []
 description: An atomic reference implementation for JRuby, Rubinius, and MRI
 email:
@@ -21,8 +21,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- lib/atomic_reference.jar
+- test/test_atomic.rb
+- .coveralls.yml
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -45,29 +48,27 @@ files:
 - lib/atomic/numeric_cas_wrapper.rb
 - lib/atomic/rbx.rb
 - lib/atomic/ruby.rb
-- lib/atomic_reference.jar
-- test/test_atomic.rb
-homepage: http://github.com/headius/ruby-atomic
+homepage: http://github.com/ruby-concurrency/ruby-atomic
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: This gem has been deprecated and merged into Concurrent Ruby (http://concurrent-ruby.com).
 rdoc_options: []
 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.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: An atomic reference implementation for JRuby, Rubinius, and MRI