Merge pull request #719 from ruby-concurrency/pitr-ch/engine

update engine detection
ruby-concurrency · May 23, 2018 · e7db59d · e7db59d
2 parents eca4cc0 + e777d1c
commit e7db59d
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 31 deletions.
diff --git a/benchmarks/futures-rubyconf2015/benchmarks/special-complete.rb b/benchmarks/futures-rubyconf2015/benchmarks/special-complete.rb
@@ -5,7 +5,7 @@
                        when Concurrent.on_cruby?
                          require 'gvl_future'
                          GVLFuture
-                       when Concurrent.on_rbx? || Concurrent.on_truffle?
+                       when Concurrent.on_rbx? || Concurrent.on_truffleruby?
                          require 'rbx_future'
                          RBXFuture
                        when Concurrent.on_jruby?

diff --git a/benchmarks/futures-rubyconf2015/benchmarks/special-fulfill.rb b/benchmarks/futures-rubyconf2015/benchmarks/special-fulfill.rb
@@ -5,7 +5,7 @@
                        when Concurrent.on_cruby?
                          require 'gvl_future'
                          GVLFuture
-                       when Concurrent.on_rbx? || Concurrent.on_truffle?
+                       when Concurrent.on_rbx? || Concurrent.on_truffleruby?
                          require 'rbx_future'
                          RBXFuture
                        when Concurrent.on_jruby?

diff --git a/benchmarks/futures-rubyconf2015/benchmarks/special-new.rb b/benchmarks/futures-rubyconf2015/benchmarks/special-new.rb
@@ -5,7 +5,7 @@
                        when Concurrent.on_cruby?
                          require 'gvl_future'
                          GVLFuture
-                       when Concurrent.on_rbx? || Concurrent.on_truffle?
+                       when Concurrent.on_rbx? || Concurrent.on_truffleruby?
                          require 'rbx_future'
                          RBXFuture
                        when Concurrent.on_jruby?

diff --git a/benchmarks/futures-rubyconf2015/benchmarks/special-value.rb b/benchmarks/futures-rubyconf2015/benchmarks/special-value.rb
@@ -5,7 +5,7 @@
                        when Concurrent.on_cruby?
                          require 'gvl_future'
                          GVLFuture
-                       when Concurrent.on_rbx? || Concurrent.on_truffle?
+                       when Concurrent.on_rbx? || Concurrent.on_truffleruby?
                          require 'rbx_future'
                          RBXFuture
                        when Concurrent.on_jruby?

diff --git a/lib/concurrent/array.rb b/lib/concurrent/array.rb
@@ -32,7 +32,7 @@ class Array < ::Array
       include JRuby::Synchronized
     end
 
-  elsif Concurrent.on_rbx? || Concurrent.on_truffle?
+  elsif Concurrent.on_rbx? || Concurrent.on_truffleruby?
     require 'monitor'
     require 'concurrent/thread_safe/util/array_hash_rbx'
 

diff --git a/lib/concurrent/hash.rb b/lib/concurrent/hash.rb
@@ -23,7 +23,7 @@ class Hash < ::Hash
       include JRuby::Synchronized
     end
 
-  elsif Concurrent.on_rbx? || Concurrent.on_truffle?
+  elsif Concurrent.on_rbx? || Concurrent.on_truffleruby?
     require 'monitor'
     require 'concurrent/thread_safe/util/array_hash_rbx'
 

diff --git a/lib/concurrent/map.rb b/lib/concurrent/map.rb
@@ -1,33 +1,27 @@
 require 'thread'
 require 'concurrent/constants'
 require 'concurrent/synchronization'
+require 'concurrent/utility/engine'
 
 module Concurrent
   # @!visibility private
   module Collection
 
     # @!visibility private
-    MapImplementation = if Concurrent.java_extensions_loaded?
+    MapImplementation = case
+                        when Concurrent.on_jruby?
                           # 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
-                          when 'jruby+truffle'
-                            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
+                        when Concurrent.on_cruby?
+                          require 'concurrent/collection/map/mri_map_backend'
                           MriMapBackend
+                        when Concurrent.on_rbx? || Concurrent.on_truffleruby?
+                          require 'concurrent/collection/map/atomic_reference_map_backend'
+                          AtomicReferenceMapBackend
+                        else
+                          warn 'Concurrent::Map: unsupported Ruby engine, using a fully synchronized Concurrent::Map implementation'
+                          require 'concurrent/collection/map/synchronized_map_backend'
+                          SynchronizedMapBackend
                         end
   end
 

diff --git a/lib/concurrent/set.rb b/lib/concurrent/set.rb
@@ -33,7 +33,7 @@ class Set < ::Set
       include JRuby::Synchronized
     end
 
-  elsif Concurrent.on_rbx? || Concurrent.on_truffle?
+  elsif Concurrent.on_rbx? || Concurrent.on_truffleruby?
     require 'monitor'
     require 'concurrent/thread_safe/util/array_hash_rbx'
 

diff --git a/lib/concurrent/synchronization/lockable_object.rb b/lib/concurrent/synchronization/lockable_object.rb
@@ -12,7 +12,7 @@ module Synchronization
                                      JRubyLockableObject
                                    when Concurrent.on_rbx?
                                      RbxLockableObject
-                                   when Concurrent.on_truffle?
+                                   when Concurrent.on_truffleruby?
                                      MriMutexLockableObject
                                    else
                                      warn 'Possibly unsupported Ruby implementation'

diff --git a/lib/concurrent/synchronization/object.rb b/lib/concurrent/synchronization/object.rb
@@ -10,7 +10,7 @@ module Synchronization
                              JRubyObject
                            when Concurrent.on_rbx?
                              RbxObject
-                           when Concurrent.on_truffle?
+                           when Concurrent.on_truffleruby?
                              TruffleObject
                            else
                              MriObject

diff --git a/lib/concurrent/synchronization/volatile.rb b/lib/concurrent/synchronization/volatile.rb
@@ -25,7 +25,7 @@ module Synchronization
       MriAttrVolatile
     when Concurrent.on_jruby?
       JRubyAttrVolatile
-    when Concurrent.on_rbx? || Concurrent.on_truffle?
+    when Concurrent.on_rbx? || Concurrent.on_truffleruby?
       RbxAttrVolatile
     else
       MriAttrVolatile

diff --git a/lib/concurrent/utility/engine.rb b/lib/concurrent/utility/engine.rb
@@ -19,7 +19,7 @@ def on_rbx?
         ruby_engine == 'rbx'
       end
 
-      def on_truffle?
+      def on_truffleruby?
         ruby_engine == 'truffleruby'
       end
 

diff --git a/lib/concurrent/utility/processor_counter.rb b/lib/concurrent/utility/processor_counter.rb
@@ -76,8 +76,6 @@ def physical_processor_count
       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/