concurrent-ruby 1.0.5 → 1.1.0.pre1

data/lib/concurrent/thread_safe/util/data_structures.rb

@@ -0,0 +1,55 @@
+require 'concurrent/thread_safe/util'
+
+module Concurrent
+  module ThreadSafe
+    module Util
+      def self.make_synchronized_on_rbx(klass)
+        klass.class_eval do
+          private
+
+          def _mon_initialize
+            @_monitor = Monitor.new unless @_monitor # avoid double initialisation
+          end
+
+          def self.new(*args)
+            obj = super(*args)
+            obj.send(:_mon_initialize)
+            obj
+          end
+        end
+
+        klass.superclass.instance_methods(false).each do |method|
+          case method
+          when :new_range, :new_reserved
+            klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def #{method}(*args)
+                obj = super
+                obj.send(:_mon_initialize)
+                obj
+              end
+            RUBY
+          else
+            klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def #{method}(*args)
+                monitor = @_monitor
+                monitor or raise("BUG: Internal monitor was not properly initialized. Please report this to the concurrent-ruby developers.")
+                monitor.synchronize { super }
+              end
+            RUBY
+          end
+        end
+      end
+
+      def self.make_synchronized_on_truffleruby(klass)
+        klass.superclass.instance_methods(false).each do |method|
+          klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def #{method}(*args, &block)    
+              # TODO (pitr-ch 01-Jul-2018): don't use internal TruffleRuby APIs  
+              Truffle::System.synchronized(self) { super(*args, &block) }
+            end
+          RUBY
+        end
+      end
+    end
+  end
+end

data/lib/concurrent/thread_safe/util/striped64.rb

@@ -86,15 +86,20 @@ module Concurrent
         # @!visibility private
         class Cell < Concurrent::AtomicReference
 
-          # TODO: this only adds padding after the :value slot, need to find a way to add padding before the slot
-          # @!visibility private
-          attr_reader *(12.times.collect{ |i| "padding_#{i}".to_sym })
-
           alias_method :cas, :compare_and_set
 
           def cas_computed
             cas(current_value = value, yield(current_value))
           end
+
+          # @!visibility private
+          def self.padding
+            # TODO: this only adds padding after the :value slot, need to find a way to add padding before the slot
+            # TODO (pitr-ch 28-Jul-2018): the padding instance vars may not be created
+            # hide from yardoc in a method
+            attr_reader *(12.times.collect{ |i| "padding_#{i}".to_sym })
+          end
+          padding
         end
 
         extend Volatile

data/lib/concurrent/timer_task.rb

@@ -126,6 +126,7 @@ module Concurrent
   #   task = Concurrent::TimerTask.new(execution_interval: 1, timeout_interval: 1){ 42 }
   #   task.add_observer(TaskObserver.new)
   #   task.execute
+  #   sleep 4
   #
   #   #=> (2013-10-13 19:08:58 -0400) Execution successfully returned 42
   #   #=> (2013-10-13 19:08:59 -0400) Execution successfully returned 42
@@ -164,7 +165,7 @@ module Concurrent
 
     # Create a new TimerTask with the given task and configuration.
     #
-    # @!macro [attach] timer_task_initialize
+    # @!macro timer_task_initialize
     #   @param [Hash] opts the options defining task execution.
     #   @option opts [Integer] :execution_interval number of seconds between
     #     task executions (default: EXECUTION_INTERVAL)
@@ -189,6 +190,7 @@ module Concurrent
     def initialize(opts = {}, &task)
       raise ArgumentError.new('no block given') unless block_given?
       super
+      set_deref_options opts
     end
 
     # Is the executor running?
@@ -280,6 +282,7 @@ module Concurrent
       @run_now = opts[:now] || opts[:run_now]
       @executor = Concurrent::SafeTaskExecutor.new(task)
       @running = Concurrent::AtomicBoolean.new(false)
+      @value = nil
 
       self.observers = Collection::CopyOnNotifyObserverSet.new
     end
@@ -305,7 +308,7 @@ module Concurrent
     # @!visibility private
     def execute_task(completion)
       return nil unless @running.true?
-      ScheduledTask.execute(execution_interval, args: [completion], &method(:timeout_task))
+      ScheduledTask.execute(timeout_interval, args: [completion], &method(:timeout_task))
       _success, value, reason = @executor.execute(self)
       if completion.try?
         self.value = value

data/lib/concurrent/tuple.rb

@@ -24,7 +24,7 @@ module Concurrent
     attr_reader :size
 
     # @!visibility private
-    Tuple = defined?(Rubinius::Tuple) ? Rubinius::Tuple : Array
+    Tuple = defined?(Rubinius::Tuple) ? Rubinius::Tuple : ::Array
     private_constant :Tuple
 
     # Create a new tuple of the given size.

data/lib/concurrent/tvar.rb

@@ -8,7 +8,7 @@ module Concurrent
   #
   # @!macro thread_safe_variable_comparison
   #
-  # {include:file:doc/tvar.md}
+  # {include:file:docs-source/tvar.md}
   class TVar < Synchronization::Object
     safe_initialization!
 
@@ -162,7 +162,7 @@ module Concurrent
 
   class Transaction
 
-    ABORTED = Object.new
+    ABORTED = ::Object.new
 
     ReadLogEntry = Struct.new(:tvar, :version)
 

data/lib/concurrent/utility/at_exit.rb

@@ -16,7 +16,7 @@ module Concurrent
     end
 
     # Add a handler to be run at `Kernel#at_exit`
-    # @param [Object] handler_id optionally provide an id, if allready present, handler is replaced
+    # @param [Object] handler_id optionally provide an id, if already present, handler is replaced
     # @yield the handler
     # @return id of the handler
     def add(handler_id = nil, &handler)

data/lib/concurrent/utility/engine.rb

@@ -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?

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.0.pre1'
+  EDGE_VERSION = '0.4.0.pre1'
 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.0.pre1
 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-08-15 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
@@ -161,18 +176,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 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