More thread_safe cleanups

Author: pitr-ch

ext/com/concurrent_ruby/ext/JRubyMapBackendLibrary.java

@@ -26,7 +26,7 @@ public class JRubyMapBackendLibrary implements Library {
   public void load(Ruby runtime, boolean wrap) throws IOException {
 
     RubyModule concurrentMod = runtime.defineModule("Concurrent");
-    RubyModule thread_safeMod = concurrentMod.defineModuleUnder("ThreadSafe");
+    RubyModule thread_safeMod = concurrentMod.defineModuleUnder("Collection");
     RubyClass jrubyRefClass = thread_safeMod.defineClassUnder("JRubyMapBackend", runtime.getObject(), BACKEND_ALLOCATOR);
     jrubyRefClass.setAllocator(BACKEND_ALLOCATOR);
     jrubyRefClass.defineAnnotatedMethods(JRubyMapBackend.class);

lib/concurrent.rb

@@ -10,25 +10,29 @@
 
 require 'concurrent/atomic/atomic_reference'
 require 'concurrent/atom'
-require 'concurrent/array'
+require 'concurrent/collection/array'
+require 'concurrent/collection/hash'
+require 'concurrent/collection/map'
+require 'concurrent/collection/tuple'
 require 'concurrent/async'
 require 'concurrent/dataflow'
 require 'concurrent/delay'
 require 'concurrent/future'
-require 'concurrent/hash'
 require 'concurrent/immutable_struct'
 require 'concurrent/ivar'
-require 'concurrent/map'
 require 'concurrent/maybe'
 require 'concurrent/mutable_struct'
 require 'concurrent/mvar'
 require 'concurrent/promise'
 require 'concurrent/scheduled_task'
 require 'concurrent/settable_struct'
 require 'concurrent/timer_task'
-require 'concurrent/tuple'
 require 'concurrent/tvar'
 
+require 'concurrent/thread_safe/synchronized_delegator'
+require 'concurrent/thread_safe/util'
+
+
 # @!macro [new] internal_implementation_note
 #
 #   @note **Private Implementation:** This abstraction is a private, internal
@@ -121,4 +125,9 @@
 # * Be small, lean, and loosely coupled
 module Concurrent
 
+  # Various classes within allows for +nil+ values to be stored,
+  # so a special +NULL+ token is required to indicate the "nil-ness".
+  # @!visibility private
+  NULL = Object.new
+
 end

lib/concurrent/array.rb

@@ -0,0 +1,38 @@
+require 'concurrent/utility/engine'
+require 'concurrent/thread_safe/util'
+
+module Concurrent
+  if Concurrent.on_cruby?
+
+    # Because MRI never runs code in parallel, the existing
+    # non-thread-safe structures should usually work fine.
+
+    # @!macro [attach] concurrent_array
+    #
+    #   A thread-safe subclass of Array. This version locks against the object
+    #   itself for every method call, ensuring only one thread can be reading
+    #   or writing at a time. This includes iteration methods like `#each`.
+    #
+    #   @see http://ruby-doc.org/core-2.2.0/Array.html Ruby standard library `Array`
+    class Array < ::Array;
+    end
+
+  elsif Concurrent.on_jruby?
+    require 'jruby/synchronized'
+
+    # @!macro concurrent_array
+    class Array < ::Array
+      include JRuby::Synchronized
+    end
+
+  elsif Concurrent.on_rbx?
+    require 'monitor'
+
+    # @!macro concurrent_array
+    class Array < ::Array
+    end
+
+    ThreadSafe::Util.make_synchronized_on_rbx Array
+  end
+end
+

lib/concurrent/collection/array.rb

@@ -0,0 +1,35 @@
+require 'concurrent/utility/engine'
+require 'concurrent/thread_safe/util'
+
+module Concurrent
+  if Concurrent.on_cruby?
+
+    # @!macro [attach] concurrent_hash
+    #
+    #   A thread-safe subclass of Hash. This version locks against the object
+    #   itself for every method call, ensuring only one thread can be reading
+    #   or writing at a time. This includes iteration methods like `#each`.
+    #
+    #   @see http://ruby-doc.org/core-2.2.0/Hash.html Ruby standard library `Hash`
+    class Hash < ::Hash;
+    end
+
+  elsif Concurrent.on_jruby?
+    require 'jruby/synchronized'
+
+    # @!macro concurrent_hash
+    class Hash < ::Hash
+      include JRuby::Synchronized
+    end
+
+  elsif Concurrent.on_rbx?
+    require 'monitor'
+
+    # @!macro concurrent_hash
+    class Hash < ::Hash
+    end
+
+    ThreadSafe::Util.make_synchronized_on_rbx Hash
+
+  end
+end

lib/concurrent/collection/hash.rb

@@ -2,22 +2,23 @@
 
 module Concurrent
   # @!visibility private
-  module ThreadSafe
+  module Collection
 
     # @!visibility private
-    MapBackend = if defined?(RUBY_ENGINE)
+    MapImplementation = if defined?(RUBY_ENGINE)
                    case RUBY_ENGINE
                    when 'jruby'
+                     # noinspection RubyResolve
                      JRubyMapBackend
                    when 'ruby'
-                     require 'concurrent/thread_safe/mri_map_backend'
+                     require 'concurrent/collection/map/mri_map_backend'
                      MriMapBackend
                    when 'rbx'
-                     require 'concurrent/thread_safe/atomic_reference_map_backend'
+                     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/thread_safe/synchronized_map_backend'
+                     require 'concurrent/collection/map/synchronized_map_backend'
                      SynchronizedMapBackend
                    end
                  else
@@ -36,7 +37,7 @@ module ThreadSafe
   # >
   # > map = Concurrent::Map.new
 
-  class Map < ThreadSafe::MapBackend
+  class Map < Collection::MapImplementation
     def initialize(options = nil, &block)
       if options.kind_of?(::Hash)
         validate_options_hash!(options)

lib/concurrent/map.rb renamed to lib/concurrent/collection/map.rb

@@ -3,7 +3,7 @@
 module Concurrent
 
   # @!visibility private
-  module ThreadSafe
+  module Collection
 
     # A Ruby port of the Doug Lea's jsr166e.ConcurrentHashMapV8 class version 1.59
     # available in public domain.
@@ -186,7 +186,7 @@ module ThreadSafe
     #
     # @!visibility private
     class AtomicReferenceMapBackend
-      
+
       # @!visibility private
       class Table < Concurrent::ThreadSafe::Util::PowerOfTwoTuple
         def cas_new_node(i, hash, key, value)

lib/concurrent/thread_safe/atomic_reference_map_backend.rb renamed to lib/concurrent/collection/map/atomic_reference_map_backend.rb

@@ -1,10 +1,10 @@
 require 'thread'
-require 'concurrent/thread_safe/non_concurrent_map_backend'
+require 'concurrent/collection/map/non_concurrent_map_backend'
 
 module Concurrent
 
   # @!visibility private
-  module ThreadSafe
+  module Collection
 
     # @!visibility private
     class MriMapBackend < NonConcurrentMapBackend

lib/concurrent/thread_safe/mri_map_backend.rb renamed to lib/concurrent/collection/map/mri_map_backend.rb

@@ -1,7 +1,7 @@
 module Concurrent
 
   # @!visibility private
-  module ThreadSafe
+  module Collection
 
     # @!visibility private
     class NonConcurrentMapBackend

lib/concurrent/thread_safe/non_concurrent_map_backend.rb renamed to lib/concurrent/collection/map/non_concurrent_map_backend.rb

@@ -1,9 +1,9 @@
-require 'concurrent/thread_safe/non_concurrent_map_backend'
+require 'concurrent/collection/map/non_concurrent_map_backend'
 
 module Concurrent
 
   # @!visibility private
-  module ThreadSafe
+  module Collection
 
     # @!visibility private
     class SynchronizedMapBackend < NonConcurrentMapBackend