concurrent-ruby 1.0.0.pre3-java → 1.0.0.pre4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d934041ab8c5ca058c9777bf2e53331159f0b919
-  data.tar.gz: e9338663092968813848ba87e48d3e25d0b1b364
+  metadata.gz: 47a7c20bd54b864a772fe6a21fc2b0cb34ba5a61
+  data.tar.gz: 5e1cddf585294a1152094a5062c110d788fd7577
 SHA512:
-  metadata.gz: c18201c8f8e58b24af2ef52b0445537af9d3709e8b1a6d817bf7ce70648189c3ba95fc8baabfe6830dc9c5a02c30d48b3834cd1cb0fd81d7c418ed6fb6deaddf
-  data.tar.gz: 00305a1e55e36dec21708d4b3e796fe235f0d73b3c77920501764062da50e10e228aedd0a0bda652dbb83131b7496ac49ea3b74609e0cc4166ab97e3a90175af
+  metadata.gz: 0383528884a29a4765f663fa3189ba0498871d54d98ef7967e64d545051b8c32a7a697ddad633566664aec7efb7fd4234487c42ed3f71a525459cccda5378c49
+  data.tar.gz: aafa4b3db601bca8675e0078f99b9a962e7ccff12d032e1aaf27fcba483e81d1ae819fac20ddb3257bfd38de319a684925a82734e1d0a758c1970b1a4a2c972b

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 ### Upcoming Release v1.0.0 (TBD)
 
-## Current Release v1.0.0.pre3 (29 September 2015)
+## Current Release v1.0.0.pre4 (08 October 2015)
+
+* Adopted a project Code of Conduct
+* Cleared interpreter warnings
+* Fixed bug in `ThreadPoolExecutor` task count methods
+* Fixed bug in 'LockFreeLinkedSet'
+* Improved Java extension loading
+* Handle Exception children in Edge::Future
+* Continued improvements to channel
+
+### Release v1.0.0.pre3 (29 September 2015)
 
 * Removed interpreter warnings.
 * Shared constants now in `lib/concurrent/constants.rb`

data/README.md

@@ -49,6 +49,14 @@ MRI 1.9.3, 2.0, 2.1, 2.2, JRuby (1.9 mode), and Rubinius 2.x are supported.
 This gem should be fully compatible with any interpreter that is compliant with Ruby 1.9.3 or newer.
 Java 8 is preferred for JRuby but every Java version on which JRuby 9000 runs will be supported.
 
+## Thread Safety
+
+*Concurrent Ruby makes the strongest thread safety guarantees of any Ruby concurrency library. We are the only library with a published [memory model](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/doc/synchronization.md) which provides consistent behavior and guarantees on all three of the main Ruby interpreters (MRI/CRuby, JRuby, and Rubinius).*
+
+Every abstraction in this library is thread safe. Similarly, all are deadlock free and many are fully lock free. Specific thread safety guarantees are documented with each abstraction.
+
+It is critical to remember, however, that Ruby is a language of mutable references. *No* concurrency library for Ruby can ever prevent the user from making thread safety mistakes (such as sharing a mutable object between threads and modifying it on both threads) or from creating deadlocks through incorrect use of locks. All the library can do is provide safe abstractions which encourage safe practices. Concurrent Ruby provides more safe concurrency abstractions than any other Ruby library, many of which support the mantra of ["Do not communicate by sharing memory; instead, share memory by communicating"](https://blog.golang.org/share-memory-by-communicating). Concurrent Ruby is also the only Ruby library which provides a full suite of thread safe and immutable variable types and data structures.
+
 ## Features & Documentation
 
 We have a roadmap guiding our work toward the [v1.0.0 release](https://github.com/ruby-concurrency/concurrent-ruby/issues/257).
@@ -229,39 +237,6 @@ and load the appropriate C extensions.
 No gems should depend on `concurrent-ruby-ext`. Doing so will force C extensions on your users.
 The best practice is to depend on `concurrent-ruby` and let users to decide if they want C extensions.
 
-### Building
-
-All published versions of this gem (core, extension, and several platform-specific packages) are compiled,
-packaged, tested, and published using an open, [automated process](https://github.com/ruby-concurrency/rake-compiler-dev-box).
-This process can also be used to create pre-compiled binaries of the extension gem for virtually
-any platform. *Documentation is forthcoming...*
-
-```
-*MRI only*
-bundle exec rake build:native       # Build concurrent-ruby-ext-<version>-<platform>.gem into the pkg dir
-bundle exec rake compile:extension  # Compile extension
-
-*JRuby only*
-bundle exec rake build              # Build JRuby-specific core gem (alias for `build:core`)
-bundle exec rake build:core         # Build concurrent-ruby-<version>-java.gem into the pkg directory
-
-*All except JRuby*
-bundle exec rake build:core         # Build concurrent-ruby-<version>.gem into the pkg directory
-bundle exec rake build:ext          # Build concurrent-ruby-ext-<version>.gem into the pkg directory
-
-*When Docker IS installed*
-bundle exec rake build:windows      # Build the windows binary <version> gems per rake-compiler-dock
-bundle exec rake build              # Build core, extension, and edge gems, including Windows binaries
-
-*When Docker is NOT installed*
-bundle exec rake build              # Build core, extension, and edge gems (excluding Windows binaries)
-
-*All*
-bundle exec rake clean              # Remove any temporary products
-bundle exec rake clobber            # Remove any generated file
-bundle exec rake compile            # Compile all the extensions
-```
-
 ## Maintainers
 
 * [Jerry D'Antonio](https://github.com/jdantonio) (creator)
@@ -277,14 +252,6 @@ bundle exec rake compile            # Compile all the extensions
 * [Charles Oliver Nutter](https://github.com/headius) for the `atomic` and `thread_safe` gems
 * [thedarkone](https://github.com/thedarkone) for the `thread_safe` gem
 
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
 ## License and Copyright
 
 *Concurrent Ruby* is free software released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/lib/concurrent/atomic/atomic_boolean.rb

@@ -48,7 +48,7 @@ module Concurrent
   #   Explicitly sets the value to false.
   #
   #   @return [Boolean] true is value has changed, otherwise false
-  
+
   ###################################################################
 
   # @!macro [new] atomic_boolean_public_api
@@ -79,7 +79,7 @@ module Concurrent
   # @!visibility private
   # @!macro internal_implementation_note
   AtomicBooleanImplementation = case
-                                when Concurrent.on_jruby?
+                                when defined?(JavaAtomicBoolean)
                                   JavaAtomicBoolean
                                 when defined?(CAtomicBoolean)
                                   CAtomicBoolean

data/lib/concurrent/atomic/atomic_fixnum.rb

@@ -96,7 +96,7 @@ module Concurrent
   # @!visibility private
   # @!macro internal_implementation_note
   AtomicFixnumImplementation = case
-                               when Concurrent.on_jruby?
+                               when defined?(JavaAtomicFixnum)
                                  JavaAtomicFixnum
                                when defined?(CAtomicFixnum)
                                  CAtomicFixnum

data/lib/concurrent/atomic/semaphore.rb

@@ -91,7 +91,7 @@ module Concurrent
   # @!visibility private
   # @!macro internal_implementation_note
   SemaphoreImplementation = case
-                            when Concurrent.on_jruby?
+                            when defined?(JavaSemaphore)
                               JavaSemaphore
                             else
                               MutexSemaphore

data/lib/concurrent/executor/ruby_thread_pool_executor.rb

@@ -29,15 +29,6 @@ module Concurrent
     # @!macro thread_pool_executor_attr_reader_min_length
     attr_reader :min_length
 
-    # @!macro thread_pool_executor_attr_reader_largest_length
-    attr_reader :largest_length
-
-    # @!macro thread_pool_executor_attr_reader_scheduled_task_count
-    attr_reader :scheduled_task_count
-
-    # @!macro thread_pool_executor_attr_reader_completed_task_count
-    attr_reader :completed_task_count
-
     # @!macro thread_pool_executor_attr_reader_idletime
     attr_reader :idletime
 
@@ -49,6 +40,21 @@ module Concurrent
       super(opts)
     end
 
+    # @!macro thread_pool_executor_attr_reader_largest_length
+    def largest_length
+      synchronize { @largest_length }
+    end
+
+    # @!macro thread_pool_executor_attr_reader_scheduled_task_count
+    def scheduled_task_count
+      synchronize { @scheduled_task_count }
+    end
+
+    # @!macro thread_pool_executor_attr_reader_completed_task_count
+    def completed_task_count
+      synchronize { @completed_task_count }
+    end
+
     # @!macro executor_service_method_can_overflow_question
     def can_overflow?
       synchronize { ns_limited_queue? }
@@ -174,6 +180,7 @@ module Concurrent
       worker = (@ready.pop if @pool.size >= @min_length) || ns_add_busy_worker
       if worker
         worker << [task, args]
+        @completed_task_count += 1
         true
       else
         false
@@ -219,8 +226,7 @@ module Concurrent
     #
     # @!visibility private
     def ns_ready_worker(worker, success = true)
-      @completed_task_count += 1 if success
-      task_and_args         = @queue.shift
+      task_and_args = @queue.shift
       if task_and_args
         worker << task_and_args
       else

data/lib/concurrent/map.rb

@@ -1,30 +1,31 @@
 require 'thread'
 require 'concurrent/constants'
+require 'concurrent/utility/native_extension_loader'
 
 module Concurrent
   # @!visibility private
   module Collection
 
     # @!visibility private
-    MapImplementation = if defined?(RUBY_ENGINE)
-                   case RUBY_ENGINE
-                   when 'jruby'
-                     # noinspection RubyResolve
-                     JRubyMapBackend
-                   when 'ruby'
-                     require 'concurrent/collection/map/mri_map_backend'
-                     MriMapBackend
-                   when 'rbx'
-                     require 'concurrent/collection/map/atomic_reference_map_backend'
-                     AtomicReferenceMapBackend
-                   else
-                     warn 'Concurrent::Map: unsupported Ruby engine, using a fully synchronized Concurrent::Map implementation' if $VERBOSE
-                     require 'concurrent/collection/map/synchronized_map_backend'
-                     SynchronizedMapBackend
-                   end
-                 else
-                   MriMapBackend
-                 end
+    MapImplementation = if Concurrent.java_extensions_loaded?
+                          # noinspection RubyResolve
+                          JRubyMapBackend
+                        elsif defined?(RUBY_ENGINE)
+                          case RUBY_ENGINE
+                          when 'ruby'
+                            require 'concurrent/collection/map/mri_map_backend'
+                            MriMapBackend
+                          when 'rbx'
+                            require 'concurrent/collection/map/atomic_reference_map_backend'
+                            AtomicReferenceMapBackend
+                          else
+                            warn 'Concurrent::Map: unsupported Ruby engine, using a fully synchronized Concurrent::Map implementation' if $VERBOSE
+                            require 'concurrent/collection/map/synchronized_map_backend'
+                            SynchronizedMapBackend
+                          end
+                        else
+                          MriMapBackend
+                        end
   end
 
   # `Concurrent::Map` is a hash-like object and should have much better performance

data/lib/concurrent/synchronization/jruby_lockable_object.rb

@@ -1,7 +1,7 @@
 module Concurrent
   module Synchronization
 
-    if Concurrent.on_jruby?
+    if Concurrent.on_jruby? && Concurrent.java_extensions_loaded?
 
       # @!visibility private
       # @!macro internal_implementation_note

data/lib/concurrent/synchronization/jruby_object.rb

@@ -1,7 +1,7 @@
 module Concurrent
   module Synchronization
 
-    if Concurrent.on_jruby?
+    if Concurrent.on_jruby? && Concurrent.java_extensions_loaded?
 
       # @!visibility private
       # @!macro internal_implementation_note

data/lib/concurrent/synchronization/lockable_object.rb

@@ -8,7 +8,7 @@ module Concurrent
                                      MriMonitorLockableObject
                                    when Concurrent.on_cruby? && Concurrent.ruby_version(:>, 1, 9, 3)
                                      MriMutexLockableObject
-                                   when Concurrent.on_jruby?
+                                   when defined? JRubyLockableObject
                                      JRubyLockableObject
                                    when Concurrent.on_rbx?
                                      RbxLockableObject

data/lib/concurrent/synchronization/object.rb

@@ -6,7 +6,7 @@ module Concurrent
     ObjectImplementation = case
                            when Concurrent.on_cruby?
                              MriObject
-                           when Concurrent.on_jruby?
+                           when defined? JRubyObject
                              JRubyObject
                            when Concurrent.on_rbx?
                              RbxObject

data/lib/concurrent/utility/native_extension_loader.rb

@@ -7,42 +7,57 @@ module Concurrent
     # @!visibility private
     module NativeExtensionLoader
 
-      @c_ext_loaded    ||= false
-      @java_ext_loaded ||= false
-
-      # @!visibility private
       def allow_c_extensions?
         Concurrent.on_cruby?
       end
 
-      if Concurrent.on_cruby? && !@c_ext_loaded
-        tries = [
-          lambda do
-            require 'concurrent/extension'
-            @c_ext_loaded = true
-          end,
-          lambda do
-            # may be a Windows cross-compiled native gem
-            require "concurrent/#{RUBY_VERSION[0..2]}/extension"
-            @c_ext_loaded = true
-          end]
-
-        tries.each do |try|
-          begin
-            try.call
-            break
-          rescue LoadError
-            next
+      def c_extensions_loaded?
+        @c_extensions_loaded ||= false
+      end
+
+      def java_extensions_loaded?
+        @java_extensions_loaded ||= false
+      end
+
+      def set_c_extensions_loaded
+        @c_extensions_loaded = true
+      end
+
+      def set_java_extensions_loaded
+        @java_extensions_loaded = true
+      end
+
+      def load_native_extensions
+        if Concurrent.on_cruby? && !c_extensions_loaded?
+          tries = [
+            lambda do
+              require 'concurrent/extension'
+              set_c_extensions_loaded
+            end,
+            lambda do
+              # may be a Windows cross-compiled native gem
+              require "concurrent/#{RUBY_VERSION[0..2]}/extension"
+              set_c_extensions_loaded
+            end]
+
+          tries.each do |try|
+            begin
+              try.call
+              break
+            rescue LoadError
+              next
+            end
           end
         end
-      end
 
-      if Concurrent.on_jruby? && !@java_ext_loaded
-        begin
-          require 'concurrent_ruby_ext'
-          @java_ext_loaded = true
-        rescue LoadError
-          # move on with pure-Ruby implementations
+        if Concurrent.on_jruby? && !java_extensions_loaded?
+          begin
+            require 'concurrent_ruby_ext'
+            set_java_extensions_loaded
+          rescue LoadError
+            # move on with pure-Ruby implementations
+            warn 'On JRuby but Java extensions failed to load.'
+          end
         end
       end
     end
@@ -51,3 +66,5 @@ module Concurrent
   # @!visibility private
   extend Utility::NativeExtensionLoader
 end
+
+Concurrent.load_native_extensions

data/lib/concurrent/version.rb

@@ -1,4 +1,4 @@
 module Concurrent
-  VERSION      = '1.0.0.pre3'
-  EDGE_VERSION = '0.2.0.pre3'
+  VERSION      = '1.0.0.pre4'
+  EDGE_VERSION = '0.2.0.pre4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concurrent-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre3
+  version: 1.0.0.pre4
 platform: java
 authors:
 - Jerry D'Antonio
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies: []
 description: |
   Modern concurrency tools including agents, futures, promises, thread pools, actors, supervisors, and more.