concurrent-ruby 1.0.5 → 1.1.1

data/lib/concurrent/utility/engine.rb

@@ -8,7 +8,7 @@ module Concurrent
       end
 
       def on_jruby_9000?
-        on_jruby? && ruby_version(:>=, 9, 0, 0, JRUBY_VERSION)
+        on_jruby? && ruby_version(JRUBY_VERSION, :>=, 9, 0, 0)
       end
 
       def on_cruby?
@@ -19,8 +19,8 @@ module Concurrent
         ruby_engine == 'rbx'
       end
 
-      def on_truffle?
-        ruby_engine == 'jruby+truffle'
+      def on_truffleruby?
+        ruby_engine == 'truffleruby'
       end
 
       def on_windows?
@@ -39,7 +39,7 @@ module Concurrent
         defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
       end
 
-      def ruby_version(comparison, major, minor, patch, version = RUBY_VERSION)
+      def ruby_version(version = RUBY_VERSION, comparison, major, minor, patch)
         result      = (version.split('.').map(&:to_i) <=> [major, minor, patch])
         comparisons = { :== => [0],
                         :>= => [1, 0],

data/lib/concurrent/utility/monotonic_time.rb

@@ -42,12 +42,12 @@ module Concurrent
   GLOBAL_MONOTONIC_CLOCK = class_definition.new
   private_constant :GLOBAL_MONOTONIC_CLOCK
 
-  # @!macro [attach] monotonic_get_time
+  # @!macro monotonic_get_time
   #
   #   Returns the current time a tracked by the application monotonic clock.
   #
-  #   @return [Float] The current monotonic time when `since` not given else
-  #     the elapsed monotonic time between `since` and the current time
+  #   @return [Float] The current monotonic time since some unspecified
+  #     starting point
   #
   #   @!macro monotonic_clock_warning
   def monotonic_time

data/lib/concurrent/utility/native_extension_loader.rb

@@ -12,19 +12,11 @@ module Concurrent
       end
 
       def c_extensions_loaded?
-        @c_extensions_loaded ||= false
+        defined?(@c_extensions_loaded) && @c_extensions_loaded
       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
+        defined?(@java_extensions_loaded) && @java_extensions_loaded
       end
 
       def load_native_extensions
@@ -33,37 +25,43 @@ module Concurrent
         end
 
         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
+          ['concurrent/concurrent_ruby_ext',
+           "concurrent/#{RUBY_VERSION[0..2]}/concurrent_ruby_ext"
+          ].each { |p| try_load_c_extension p }
         end
 
         if Concurrent.on_jruby? && !java_extensions_loaded?
           begin
-            require 'concurrent_ruby_ext'
+            require 'concurrent/concurrent_ruby.jar'
             set_java_extensions_loaded
-          rescue LoadError
-            # move on with pure-Ruby implementations
-            raise 'On JRuby but Java extensions failed to load.'
+          rescue LoadError => e
+            raise e, "Java extensions are required for JRuby.\n" + e.message, e.backtrace
           end
         end
       end
+
+      private
+
+      def set_c_extensions_loaded
+        @c_extensions_loaded = true
+      end
+
+      def set_java_extensions_loaded
+        @java_extensions_loaded = true
+      end
+
+      def try_load_c_extension(path)
+        require path
+        set_c_extensions_loaded
+      rescue LoadError => e
+        if e.path == path
+          # move on with pure-Ruby implementations
+          # TODO (pitr-ch 12-Jul-2018): warning on verbose?
+        else
+          raise e
+        end
+      end
+
     end
   end
 

data/lib/concurrent/utility/processor_counter.rb

@@ -76,8 +76,6 @@ module Concurrent
       def compute_processor_count
         if Concurrent.on_jruby?
           java.lang.Runtime.getRuntime.availableProcessors
-        elsif Concurrent.on_truffle?
-          Truffle::Primitive.logical_processors
         else
           os_name = RbConfig::CONFIG["target_os"]
           if os_name =~ /mingw|mswin/

data/lib/concurrent/version.rb

@@ -1,4 +1,4 @@
 module Concurrent
-  VERSION      = '1.0.5'
-  EDGE_VERSION = '0.3.1'
+  VERSION      = '1.1.1'
+  EDGE_VERSION = '0.4.1'
 end

data/lib/concurrent-ruby.rb

@@ -0,0 +1 @@
+require_relative "./concurrent"

data/lib/concurrent.rb

@@ -1,3 +1,5 @@
+require 'concurrent/utility/193'
+
 require 'concurrent/version'
 require 'concurrent/constants'
 require 'concurrent/errors'
@@ -7,11 +9,13 @@ require 'concurrent/atomics'
 require 'concurrent/executors'
 require 'concurrent/synchronization'
 
+require 'concurrent/atomic/atomic_markable_reference'
 require 'concurrent/atomic/atomic_reference'
 require 'concurrent/agent'
 require 'concurrent/atom'
 require 'concurrent/array'
 require 'concurrent/hash'
+require 'concurrent/set'
 require 'concurrent/map'
 require 'concurrent/tuple'
 require 'concurrent/async'
@@ -29,20 +33,21 @@ require 'concurrent/scheduled_task'
 require 'concurrent/settable_struct'
 require 'concurrent/timer_task'
 require 'concurrent/tvar'
+require 'concurrent/promises'
 
 require 'concurrent/thread_safe/synchronized_delegator'
 require 'concurrent/thread_safe/util'
 
 require 'concurrent/options'
 
-# @!macro [new] internal_implementation_note
+# @!macro internal_implementation_note
 #
 #   @note **Private Implementation:** This abstraction is a private, internal
 #     implementation detail. It should never be used directly.
 
-# @!macro [new] monotonic_clock_warning
+# @!macro monotonic_clock_warning
 #
-#   @note Time calculations one all platforms and languages are sensitive to
+#   @note Time calculations on all platforms and languages are sensitive to
 #     changes to the system clock. To alleviate the potential problems
 #     associated with changing the system clock while an application is running,
 #     most modern operating systems provide a monotonic clock that operates
@@ -58,7 +63,7 @@ require 'concurrent/options'
 #
 #   @see http://linux.die.net/man/3/clock_gettime Linux clock_gettime(3)
 
-# @!macro [new] copy_options
+# @!macro copy_options
 #
 #   ## Copy Options
 #
@@ -94,7 +99,7 @@ require 'concurrent/options'
 #   as close to the behavior of a "pure" functional language (like Erlang, Clojure,
 #   or Haskell) as we are likely to get in Ruby.
 
-# @!macro [attach] deref_options
+# @!macro deref_options
 #
 #   @option opts [Boolean] :dup_on_deref (false) Call `#dup` before
 #     returning the data from {#value}
@@ -104,27 +109,28 @@ require 'concurrent/options'
 #     method, call the given proc passing the internal value as the sole
 #     argument then return the new value returned from the proc.
 
-# @!macro [attach] executor_and_deref_options
+# @!macro executor_and_deref_options
 #
 #   @param [Hash] opts the options used to define the behavior at update and deref
 #     and to specify the executor on which to perform actions
 #   @option opts [Executor] :executor when set use the given `Executor` instance.
-#     Three special values are also supported: `:task` returns the global task pool,
-#     `:operation` returns the global operation pool, and `:immediate` returns a new
-#     `ImmediateExecutor` object.
+#     Three special values are also supported: `:io` returns the global pool for
+#     long, blocking (IO) tasks, `:fast` returns the global pool for short, fast
+#     operations, and `:immediate` returns the global `ImmediateExecutor` object.
 #   @!macro deref_options
 
-# Modern concurrency tools for Ruby. Inspired by Erlang, Clojure, Scala, Haskell,
-# F#, C#, Java, and classic concurrency patterns.
-#
-# The design goals of this gem are:
+# @!macro warn.edge
+#   @api Edge
+#   @note **Edge Features** are under active development and may change frequently.
 #
-# * Stay true to the spirit of the languages providing inspiration
-# * But implement in a way that makes sense for Ruby
-# * Keep the semantics as idiomatic Ruby as possible
-# * Support features that make sense in Ruby
-# * Exclude features that don't make sense in Ruby
-# * Be small, lean, and loosely coupled
-module Concurrent
+#     -   Deprecations are not added before incompatible changes.
+#     -   Edge version: _major_ is always 0, _minor_ bump means incompatible change,
+#         _patch_ bump means compatible change.
+#     -   Edge features may also lack tests and documentation.
+#     -   Features developed in `concurrent-ruby-edge` are expected to move
+#         to `concurrent-ruby` when finalised.
 
+
+# {include:file:README.md}
+module Concurrent
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concurrent-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.1
 platform: ruby
 authors:
 - Jerry D'Antonio
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies: []
 description: |
   Modern concurrency tools including agents, futures, promises, thread pools, actors, supervisors, and more.
@@ -20,12 +20,30 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
-- LICENSE.txt
+- LICENSE.md
 - CHANGELOG.md
 files:
 - CHANGELOG.md
-- LICENSE.txt
+- Gemfile
+- LICENSE.md
 - README.md
+- Rakefile
+- ext/concurrent-ruby/ConcurrentRubyService.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/AtomicReferenceLibrary.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/JRubyMapBackendLibrary.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/JavaAtomicBooleanLibrary.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/JavaAtomicFixnumLibrary.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/JavaSemaphoreLibrary.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/SynchronizationLibrary.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/jsr166e/ConcurrentHashMap.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/jsr166e/ConcurrentHashMapV8.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/jsr166e/LongAdder.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/jsr166e/Striped64.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/jsr166e/nounsafe/ConcurrentHashMapV8.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/jsr166e/nounsafe/LongAdder.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/jsr166e/nounsafe/Striped64.java
+- ext/concurrent-ruby/com/concurrent_ruby/ext/jsr166y/ThreadLocalRandom.java
+- lib/concurrent-ruby.rb
 - lib/concurrent.rb
 - lib/concurrent/agent.rb
 - lib/concurrent/array.rb
@@ -34,6 +52,7 @@ files:
 - lib/concurrent/atomic/abstract_thread_local_var.rb
 - lib/concurrent/atomic/atomic_boolean.rb
 - lib/concurrent/atomic/atomic_fixnum.rb
+- lib/concurrent/atomic/atomic_markable_reference.rb
 - lib/concurrent/atomic/atomic_reference.rb
 - lib/concurrent/atomic/count_down_latch.rb
 - lib/concurrent/atomic/cyclic_barrier.rb
@@ -49,18 +68,13 @@ files:
 - lib/concurrent/atomic/ruby_thread_local_var.rb
 - lib/concurrent/atomic/semaphore.rb
 - lib/concurrent/atomic/thread_local_var.rb
-- lib/concurrent/atomic_reference/concurrent_update_error.rb
-- lib/concurrent/atomic_reference/direct_update.rb
-- lib/concurrent/atomic_reference/jruby+truffle.rb
-- lib/concurrent/atomic_reference/jruby.rb
 - lib/concurrent/atomic_reference/mutex_atomic.rb
 - lib/concurrent/atomic_reference/numeric_cas_wrapper.rb
-- lib/concurrent/atomic_reference/rbx.rb
-- lib/concurrent/atomic_reference/ruby.rb
 - lib/concurrent/atomics.rb
 - lib/concurrent/collection/copy_on_notify_observer_set.rb
 - lib/concurrent/collection/copy_on_write_observer_set.rb
 - lib/concurrent/collection/java_non_concurrent_priority_queue.rb
+- lib/concurrent/collection/lock_free_stack.rb
 - lib/concurrent/collection/map/atomic_reference_map_backend.rb
 - lib/concurrent/collection/map/mri_map_backend.rb
 - lib/concurrent/collection/map/non_concurrent_map_backend.rb
@@ -72,11 +86,11 @@ files:
 - lib/concurrent/concern/logging.rb
 - lib/concurrent/concern/obligation.rb
 - lib/concurrent/concern/observable.rb
+- lib/concurrent/concurrent_ruby.jar
 - lib/concurrent/configuration.rb
 - lib/concurrent/constants.rb
 - lib/concurrent/dataflow.rb
 - lib/concurrent/delay.rb
-- lib/concurrent/edge.rb
 - lib/concurrent/errors.rb
 - lib/concurrent/exchanger.rb
 - lib/concurrent/executor/abstract_executor_service.rb
@@ -104,14 +118,16 @@ files:
 - lib/concurrent/hash.rb
 - lib/concurrent/immutable_struct.rb
 - lib/concurrent/ivar.rb
-- lib/concurrent/lazy_register.rb
 - lib/concurrent/map.rb
 - lib/concurrent/maybe.rb
 - lib/concurrent/mutable_struct.rb
 - lib/concurrent/mvar.rb
 - lib/concurrent/options.rb
 - lib/concurrent/promise.rb
+- lib/concurrent/promises.rb
+- lib/concurrent/re_include.rb
 - lib/concurrent/scheduled_task.rb
+- lib/concurrent/set.rb
 - lib/concurrent/settable_struct.rb
 - lib/concurrent/synchronization.rb
 - lib/concurrent/synchronization/abstract_lockable_object.rb
@@ -122,19 +138,18 @@ files:
 - lib/concurrent/synchronization/jruby_object.rb
 - lib/concurrent/synchronization/lock.rb
 - lib/concurrent/synchronization/lockable_object.rb
-- lib/concurrent/synchronization/mri_lockable_object.rb
 - lib/concurrent/synchronization/mri_object.rb
+- lib/concurrent/synchronization/mutex_lockable_object.rb
 - lib/concurrent/synchronization/object.rb
 - lib/concurrent/synchronization/rbx_lockable_object.rb
 - lib/concurrent/synchronization/rbx_object.rb
-- lib/concurrent/synchronization/truffle_lockable_object.rb
-- lib/concurrent/synchronization/truffle_object.rb
+- lib/concurrent/synchronization/truffleruby_object.rb
 - lib/concurrent/synchronization/volatile.rb
 - lib/concurrent/thread_safe/synchronized_delegator.rb
 - lib/concurrent/thread_safe/util.rb
 - lib/concurrent/thread_safe/util/adder.rb
-- lib/concurrent/thread_safe/util/array_hash_rbx.rb
 - lib/concurrent/thread_safe/util/cheap_lockable.rb
+- lib/concurrent/thread_safe/util/data_structures.rb
 - lib/concurrent/thread_safe/util/power_of_two_tuple.rb
 - lib/concurrent/thread_safe/util/striped64.rb
 - lib/concurrent/thread_safe/util/volatile.rb
@@ -142,6 +157,7 @@ files:
 - lib/concurrent/timer_task.rb
 - lib/concurrent/tuple.rb
 - lib/concurrent/tvar.rb
+- lib/concurrent/utility/193.rb
 - lib/concurrent/utility/at_exit.rb
 - lib/concurrent/utility/engine.rb
 - lib/concurrent/utility/monotonic_time.rb
@@ -169,10 +185,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Modern concurrency tools for Ruby. Inspired by Erlang, Clojure, Scala, Haskell,
   F#, C#, Java, and classic concurrency patterns.
 test_files: []
-has_rdoc: 

data/lib/concurrent/atomic_reference/concurrent_update_error.rb

@@ -1,8 +0,0 @@
-module Concurrent
-
-  # @!macro atomic_reference
-  class ConcurrentUpdateError < ThreadError
-    # frozen pre-allocated backtrace to speed ConcurrentUpdateError
-    CONC_UP_ERR_BACKTRACE = ['backtrace elided; set verbose to enable'].freeze
-  end
-end

data/lib/concurrent/atomic_reference/direct_update.rb

@@ -1,81 +0,0 @@
-require 'concurrent/atomic_reference/concurrent_update_error'
-
-module Concurrent
-
-  # Define update methods that use direct paths
-  #
-  # @!visibility private
-  # @!macro internal_implementation_note
-  module AtomicDirectUpdate
-
-    # @!macro [attach] atomic_reference_method_update
-    #
-    # Pass the current value to the given block, replacing it
-    # with the block's result. May retry if the value changes
-    # during the block's execution.
-    #
-    # @yield [Object] Calculate a new value for the atomic reference using
-    #   given (old) value
-    # @yieldparam [Object] old_value the starting value of the atomic reference
-    #
-    # @return [Object] the new value
-    def update
-      true until compare_and_set(old_value = get, new_value = yield(old_value))
-      new_value
-    end
-
-    # @!macro [attach] atomic_reference_method_try_update
-    #
-    # Pass the current value to the given block, replacing it
-    # with the block's result. Return nil if the update fails.
-    #
-    # @yield [Object] Calculate a new value for the atomic reference using
-    #   given (old) value
-    # @yieldparam [Object] old_value the starting value of the atomic reference
-    #
-    # @note This method was altered to avoid raising an exception by default.
-    # Instead, this method now returns `nil` in case of failure. For more info,
-    # please see: https://github.com/ruby-concurrency/concurrent-ruby/pull/336
-    #
-    # @return [Object] the new value, or nil if update failed
-    def try_update
-      old_value = get
-      new_value = yield old_value
-
-      return unless compare_and_set old_value, new_value
-
-      new_value
-    end
-
-    # @!macro [attach] atomic_reference_method_try_update!
-    #
-    # Pass the current value to the given block, replacing it
-    # with the block's result. Raise an exception if the update
-    # fails.
-    #
-    # @yield [Object] Calculate a new value for the atomic reference using
-    #   given (old) value
-    # @yieldparam [Object] old_value the starting value of the atomic reference
-    #
-    # @note This behavior mimics the behavior of the original
-    # `AtomicReference#try_update` API. The reason this was changed was to
-    # avoid raising exceptions (which are inherently slow) by default. For more
-    # info: https://github.com/ruby-concurrency/concurrent-ruby/pull/336
-    #
-    # @return [Object] the new value
-    #
-    # @raise [Concurrent::ConcurrentUpdateError] if the update fails
-    def try_update!
-      old_value = get
-      new_value = yield old_value
-      unless compare_and_set(old_value, new_value)
-        if $VERBOSE
-          raise ConcurrentUpdateError, "Update failed"
-        else
-          raise ConcurrentUpdateError, "Update failed", ConcurrentUpdateError::CONC_UP_ERR_BACKTRACE
-        end
-      end
-      new_value
-    end
-  end
-end

data/lib/concurrent/atomic_reference/jruby+truffle.rb

@@ -1,2 +0,0 @@
-require 'atomic'
-require 'concurrent/atomic_reference/rbx'

data/lib/concurrent/atomic_reference/jruby.rb

@@ -1,16 +0,0 @@
-require 'concurrent/synchronization'
-
-if defined?(Concurrent::JavaAtomicReference)
-  require 'concurrent/atomic_reference/direct_update'
-
-  module Concurrent
-
-    # @!macro atomic_reference
-    #
-    # @!visibility private
-    # @!macro internal_implementation_note
-    class JavaAtomicReference
-      include Concurrent::AtomicDirectUpdate
-    end
-  end
-end

data/lib/concurrent/atomic_reference/rbx.rb

@@ -1,22 +0,0 @@
-require 'concurrent/atomic_reference/direct_update'
-require 'concurrent/atomic_reference/numeric_cas_wrapper'
-
-module Concurrent
-
-  # @!macro atomic_reference
-  #
-  # @note Extends `Rubinius::AtomicReference` version adding aliases
-  #   and numeric logic.
-  #
-  # @!visibility private
-  # @!macro internal_implementation_note
-  class RbxAtomicReference < Rubinius::AtomicReference
-    alias _compare_and_set compare_and_set
-    include Concurrent::AtomicDirectUpdate
-    include Concurrent::AtomicNumericCompareAndSetWrapper
-
-    alias_method :value, :get
-    alias_method :value=, :set
-    alias_method :swap, :get_and_set
-  end
-end

data/lib/concurrent/atomic_reference/ruby.rb

@@ -1,32 +0,0 @@
-if defined? Concurrent::CAtomicReference
-  require 'concurrent/synchronization'
-  require 'concurrent/atomic_reference/direct_update'
-  require 'concurrent/atomic_reference/numeric_cas_wrapper'
-
-  module Concurrent
-
-    # @!macro atomic_reference
-    #
-    # @!visibility private
-    # @!macro internal_implementation_note
-    class CAtomicReference
-      include Concurrent::AtomicDirectUpdate
-      include Concurrent::AtomicNumericCompareAndSetWrapper
-
-      # @!method initialize
-      #   @!macro atomic_reference_method_initialize
-
-      # @!method get
-      #   @!macro atomic_reference_method_get
-
-      # @!method set
-      #   @!macro atomic_reference_method_set
-
-      # @!method get_and_set
-      #   @!macro atomic_reference_method_get_and_set
-
-      # @!method _compare_and_set
-      #   @!macro atomic_reference_method_compare_and_set
-    end
-  end
-end

data/lib/concurrent/edge.rb

@@ -1,26 +0,0 @@
-module Concurrent
-
-  # A submodule for unstable, highly experimental features that are likely to
-  # change often and which may never become part of the core gem. Also for
-  # new, experimental version of abstractions already in the core gem.
-  #
-  # Most new features should start in this module, clearly indicating the
-  # experimental and unstable nature of the feature. Once a feature becomes
-  # more stable and is a candidate for inclusion in the core gem it should
-  # be moved up to the `Concurrent` module, where it would reside once merged
-  # into the core gem.
-  #
-  # The only exception to this is for features which *replace* features from
-  # the core gem in ways that are breaking and not backward compatible. These
-  # features should remain in this module until merged into the core gem. This
-  # will prevent namespace collisions.
-  #
-  # @!macro [attach] edge_warning
-  #   @api Edge
-  #   @note **Edge Feature:** Edge features are under active development and may change frequently. They are expected not to
-  #     keep backward compatibility (there may also lack tests and documentation). Semantic versions will
-  #     be obeyed though. Features developed in `concurrent-ruby-edge` are expected to move
-  #     to `concurrent-ruby` when final.
-  module Edge
-  end
-end