Merge pull request #153 from ruby-concurrency/native-extension-aliases

Fix bug #150 -- Erroneous C extension behavior on Rubinius.

Author: jdantonio

.travis.yml

@@ -14,6 +14,7 @@ branches:
     - master
 matrix:
   allow_failures:
+    - rvm: rbx-2
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: 1.9.3

Rakefile

@@ -34,7 +34,7 @@ if defined?(JRUBY_VERSION)
     ext.ext_dir = 'ext'
   end
 
-elsif Concurrent.use_c_extensions?
+elsif Concurrent.allow_c_extensions?
 
   Rake::ExtensionTask.new(EXTENSION_NAME, GEMSPEC) do |ext|
     ext.ext_dir = "ext/#{EXTENSION_NAME}"

ext/concurrent_ruby_ext/extconf.rb

@@ -12,7 +12,7 @@ def create_dummy_makefile
   end
 end
 
-if defined?(JRUBY_VERSION) || ! Concurrent.use_c_extensions? 
+if defined?(JRUBY_VERSION) || ! Concurrent.allow_c_extensions? 
   create_dummy_makefile
   warn 'C optimizations are not supported on this version of Ruby.'
 else

lib/concurrent/atomic.rb

@@ -57,19 +57,16 @@
   class Concurrent::Atomic < Concurrent::JavaAtomic
   end
 
-elsif defined? Concurrent::CAtomic
+elsif defined? Concurrent::RbxAtomic
 
-  # @!macro [attach] concurrent_update_error
-  #
-  # This exception may be thrown by methods that have detected concurrent
-  # modification of an object when such modification is not permissible.
-  class Concurrent::Atomic < Concurrent::CAtomic
+  # @!macro atomic_reference
+  class Concurrent::Atomic < Concurrent::RbxAtomic
   end
 
-elsif defined? Concurrent::RbxAtomic
+elsif Concurrent.allow_c_native_class?('CAtomic')
 
   # @!macro atomic_reference
-  class Concurrent::Atomic < Concurrent::RbxAtomic
+  class Concurrent::Atomic < Concurrent::CAtomic
   end
 
 else

lib/concurrent/atomic/atomic_boolean.rb

@@ -1,3 +1,6 @@
+require_relative '../../extension_helper'
+Concurrent.safe_require_c_extensions
+
 module Concurrent
 
   # @!macro [attach] atomic_boolean
@@ -159,7 +162,7 @@ def make_false
     class AtomicBoolean < JavaAtomicBoolean
     end
 
-  elsif defined? Concurrent::CAtomicBoolean
+  elsif Concurrent.allow_c_native_class?('CAtomicBoolean')
 
     # @!macro atomic_boolean
     class CAtomicBoolean

lib/concurrent/atomic/atomic_fixnum.rb

@@ -1,3 +1,6 @@
+require_relative '../../extension_helper'
+Concurrent.safe_require_c_extensions
+
 module Concurrent
 
   # @!macro [attach] atomic_fixnum
@@ -163,7 +166,7 @@ def compare_and_set(expect, update)
     class AtomicFixnum < JavaAtomicFixnum
     end
 
-  elsif defined? Concurrent::CAtomicFixnum
+  elsif Concurrent.allow_c_native_class?('CAtomicFixnum')
 
     # @!macro atomic_fixnum
     class CAtomicFixnum

lib/concurrent/atomic_reference/jruby.rb

@@ -1,10 +1,14 @@
-require 'concurrent_ruby_ext'
-require 'concurrent/atomic_reference/direct_update'
+require_relative '../../extension_helper'
+Concurrent.safe_require_java_extensions
 
-module Concurrent
+if defined?(Concurrent::JavaAtomic)
+  require 'concurrent/atomic_reference/direct_update'
 
-  # @!macro atomic_reference
-  class JavaAtomic
-    include Concurrent::AtomicDirectUpdate
+  module Concurrent
+
+    # @!macro atomic_reference
+    class JavaAtomic
+      include Concurrent::AtomicDirectUpdate
+    end
   end
 end

lib/concurrent/atomic_reference/ruby.rb

@@ -1,8 +1,12 @@
-begin
-  require 'concurrent_ruby_ext'
-rescue LoadError
-  # may be a Windows cross-compiled native gem
-  require "#{RUBY_VERSION[0..2]}/concurrent_ruby_ext"
+require_relative '../../extension_helper'
+
+if Concurrent.allow_c_extensions?
+  begin
+    require 'concurrent_ruby_ext'
+  rescue LoadError
+    # may be a Windows cross-compiled native gem
+    require "#{RUBY_VERSION[0..2]}/concurrent_ruby_ext"
+  end
 end
 
 require 'concurrent/atomic_reference/direct_update'
@@ -14,19 +18,19 @@ module Concurrent
   class CAtomic
     include Concurrent::AtomicDirectUpdate
     include Concurrent::AtomicNumericCompareAndSetWrapper
-    
+
     # @!method initialize
     #   @!macro atomic_reference_method_initialize
-    
+
     # @!method get
     #   @!macro atomic_reference_method_get
-    
+
     # @!method set
     #   @!macro atomic_reference_method_set
-    
+
     # @!method get_and_set
     #   @!macro atomic_reference_method_get_and_set
-    
+
     # @!method _compare_and_set
     #   @!macro atomic_reference_method_compare_and_set
   end

lib/concurrent/version.rb

@@ -1,3 +1,3 @@
 module Concurrent
-  VERSION = '0.7.0.rc2'
+  VERSION = '0.7.0.rc3'
 end

lib/extension_helper.rb

@@ -1,9 +1,28 @@
-require 'rbconfig'
-
 module Concurrent
-  def self.use_c_extensions?
-    host_os = RbConfig::CONFIG['host_os']
-    ruby_name = RbConfig::CONFIG['ruby_install_name']
-    (ruby_name =~ /^ruby$/i || host_os =~ /mswin32/i || host_os =~ /mingw32/i)
+
+  # @!visibility private
+  def self.allow_c_extensions?
+    defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby'
+  end
+
+  # @!visibility private
+  def self.allow_c_native_class?(clazz)
+    allow_c_extensions? && Concurrent.const_defined?(clazz)
+  rescue
+    false
+  end
+
+  # @!visibility private
+  def self.safe_require_c_extensions
+    require 'concurrent_ruby_ext' if allow_c_extensions?
+  rescue LoadError
+    #warn 'Attempted to load C extensions on unsupported platform. Continuing with pure-Ruby.'
+  end
+
+  # @!visibility private
+  def self.safe_require_java_extensions
+    require 'concurrent_ruby_ext' if RUBY_PLATFORM == 'java'
+  rescue LoadError
+    #warn 'Attempted to load Java extensions on unsupported platform. Continuing with pure-Ruby.'
   end
 end