From eb1bd1d540fe19c105c6d23686c93120ddf407a4 Mon Sep 17 00:00:00 2001 From: Petr Chalupa Date: Wed, 21 Feb 2018 22:06:21 +0100 Subject: [PATCH] Use full truffleruby name --- benchmarks/futures-rubyconf2015/benchmarks/special-complete.rb | 2 +- benchmarks/futures-rubyconf2015/benchmarks/special-fulfill.rb | 2 +- benchmarks/futures-rubyconf2015/benchmarks/special-new.rb | 2 +- benchmarks/futures-rubyconf2015/benchmarks/special-value.rb | 2 +- lib/concurrent/array.rb | 2 +- lib/concurrent/hash.rb | 2 +- lib/concurrent/map.rb | 2 +- lib/concurrent/set.rb | 2 +- lib/concurrent/synchronization/lockable_object.rb | 2 +- lib/concurrent/synchronization/object.rb | 2 +- lib/concurrent/synchronization/volatile.rb | 2 +- lib/concurrent/utility/engine.rb | 2 +- lib/concurrent/utility/processor_counter.rb | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/benchmarks/futures-rubyconf2015/benchmarks/special-complete.rb b/benchmarks/futures-rubyconf2015/benchmarks/special-complete.rb index 68f2efa34..3e118d315 100644 --- 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 index 803fc1179..80b5239d5 100644 --- 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 index fc2afc78c..f6ccbde69 100644 --- 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 index 695f70511..448436689 100644 --- 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 index 8d76ccf04..c83f3bb06 100644 --- 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 index 644af9891..9c952c1fb 100644 --- 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 index 5c64e73ac..0fa31b6b3 100644 --- a/lib/concurrent/map.rb +++ b/lib/concurrent/map.rb @@ -15,7 +15,7 @@ module Collection when Concurrent.on_cruby? require 'concurrent/collection/map/mri_map_backend' MriMapBackend - when Concurrent.on_rbx? || Concurrent.on_truffle? + when Concurrent.on_rbx? || Concurrent.on_truffleruby? require 'concurrent/collection/map/atomic_reference_map_backend' AtomicReferenceMapBackend else diff --git a/lib/concurrent/set.rb b/lib/concurrent/set.rb index ea6e85f09..7e9956f29 100644 --- 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 index a28d5af00..e87528e2d 100644 --- 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 index 21b5695df..c42c7e956 100644 --- 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 index 45269dff9..e1f2c12ba 100644 --- 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 index 7896b2600..2b3f86c06 100644 --- 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 index 078bdf41a..adf1fd4f6 100644 --- a/lib/concurrent/utility/processor_counter.rb +++ b/lib/concurrent/utility/processor_counter.rb @@ -76,7 +76,7 @@ def physical_processor_count def compute_processor_count if Concurrent.on_jruby? java.lang.Runtime.getRuntime.availableProcessors - elsif Concurrent.on_truffle? + elsif Concurrent.on_truffleruby? Truffle::Primitive.logical_processors else os_name = RbConfig::CONFIG["target_os"]