Moved native extension helpers into Utility module.

jdantonio · jdantonio · commit 7d0b022fc11b · 2015-05-21T18:40:09.000-06:00
diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,7 @@
 #!/usr/bin/env rake
 
 require 'concurrent/version'
-require 'concurrent/native_extensions'
+require 'concurrent/utility/native_extension_loader'
 
 ## load the two gemspec files
 CORE_GEMSPEC = Gem::Specification.load('concurrent-ruby.gemspec')
diff --git a/ext/concurrent/extconf.rb b/ext/concurrent/extconf.rb
@@ -1,6 +1,6 @@
 require 'fileutils'
 
-require 'concurrent/native_extensions'
+require 'concurrent/utility/native_extension_loader'
 
 EXTENSION_NAME = 'extension'
 
diff --git a/lib/concurrent/atomic/atomic_boolean.rb b/lib/concurrent/atomic/atomic_boolean.rb
@@ -1,5 +1,5 @@
-require 'concurrent/native_extensions'
 require 'concurrent/synchronization_object'
+require 'concurrent/utility/native_extension_loader'
 
 module Concurrent
 
diff --git a/lib/concurrent/atomic/atomic_fixnum.rb b/lib/concurrent/atomic/atomic_fixnum.rb
@@ -1,5 +1,5 @@
-require 'concurrent/native_extensions'
 require 'concurrent/synchronization_object'
+require 'concurrent/utility/native_extension_loader'
 
 module Concurrent
 
diff --git a/lib/concurrent/atomic/atomic_reference.rb b/lib/concurrent/atomic/atomic_reference.rb
@@ -1,5 +1,5 @@
-require 'concurrent/native_extensions'
 require 'concurrent/utility/engine'
+require 'concurrent/utility/native_extension_loader'
 require 'concurrent/atomic_reference/concurrent_update_error'
 require 'concurrent/atomic_reference/mutex_atomic'
 
diff --git a/lib/concurrent/atomic_reference/jruby.rb b/lib/concurrent/atomic_reference/jruby.rb
@@ -1,4 +1,4 @@
-require 'concurrent/native_extensions'
+require 'concurrent/utility/native_extension_loader'
 
 if defined?(Concurrent::JavaAtomicReference)
   require 'concurrent/atomic_reference/direct_update'
diff --git a/lib/concurrent/atomic_reference/ruby.rb b/lib/concurrent/atomic_reference/ruby.rb
@@ -1,7 +1,7 @@
 if defined? Concurrent::CAtomicReference
-  require 'concurrent/native_extensions'
   require 'concurrent/atomic_reference/direct_update'
   require 'concurrent/atomic_reference/numeric_cas_wrapper'
+  require 'concurrent/utility/native_extension_loader'
 
   module Concurrent
 
diff --git a/lib/concurrent/native_extensions.rb b/lib/concurrent/native_extensions.rb
diff --git a/lib/concurrent/native_extensions/before.rb b/lib/concurrent/native_extensions/before.rb
diff --git a/lib/concurrent/native_extensions/load.rb b/lib/concurrent/native_extensions/load.rb
diff --git a/lib/concurrent/synchronization_object.rb b/lib/concurrent/synchronization_object.rb
@@ -1,5 +1,5 @@
 require 'concurrent/utility/engine'
-require 'concurrent/native_extensions' # JavaObject
+require 'concurrent/utility/native_extension_loader'
 require 'concurrent/synchronization_object_impl/abstract_object'
 require 'concurrent/synchronization_object_impl/mutex_object'
 require 'concurrent/synchronization_object_impl/monitor_object'
diff --git a/lib/concurrent/utility/native_extension_loader.rb b/lib/concurrent/utility/native_extension_loader.rb
@@ -0,0 +1,54 @@
+require 'concurrent/synchronization_object_impl/abstract_object' # for JRuby
+require 'concurrent/utility/engine'
+
+module Concurrent
+  module Utility
+
+    module NativeExtensionLoader
+
+      @c_ext_loaded    ||= false
+      @java_ext_loaded ||= false
+
+      # @!visibility private
+      def allow_c_extensions?
+        Concurrent.on_cruby?
+      end
+
+      if Concurrent.on_cruby? && !@c_ext_loaded
+        tries = [
+          lambda do
+            require 'concurrent/extension'
+            @c_ext_loaded = true
+          end,
+          lambda do
+            # may be a Windows cross-compiled native gem
+            require "concurrent/#{RUBY_VERSION[0..2]}/extension"
+            @c_ext_loaded = true
+          end,
+          lambda do
+            warn 'Performance on MRI may be improved with the concurrent-ruby-ext gem. Please see http://concurrent-ruby.com'
+          end]
+
+        tries.each do |try|
+          begin
+            try.call
+            break
+          rescue LoadError
+            next
+          end
+        end
+      end
+
+      if Concurrent.on_jruby? && !@java_ext_loaded
+        begin
+          require 'concurrent_ruby_ext'
+          @java_ext_loaded = true
+        rescue LoadError
+          warn 'Performance on JRuby may be improved by installing the pre-compiled Java extensions. Please see http://concurrent-ruby.com'
+        end
+      end
+    end
+  end
+
+  extend Utility::NativeExtensionLoader
+end
diff --git a/spec/support/example_group_extensions.rb b/spec/support/example_group_extensions.rb
@@ -1,6 +1,6 @@
 require 'rbconfig'
-require 'concurrent/native_extensions'
 require 'concurrent/utility/engine'
+require 'concurrent/utility/native_extension_loader'
 
 module Concurrent
   module TestHelpers
@@ -15,6 +15,7 @@ def delta(v1, v2)
     end
 
     include Utility::EngineDetector
+    include Utility::NativeExtensionLoader
 
     def use_c_extensions?
       Concurrent.allow_c_extensions? # from extension_helper.rb

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require 'concurrent/native_extensions'`
	`1`	`+require 'concurrent/utility/native_extension_loader'`
`2`	`2`
`3`	`3`	`if defined?(Concurrent::JavaAtomicReference)`
`4`	`4`	`require 'concurrent/atomic_reference/direct_update'`