Gems built with new build boxes and tested no several operating systems.

C extensions added back to platform-independent gem.

Fixed platform-independent gem build.

Platform-independent build now works the way we intend.

Fixed package and build problems in Rakefile.

Better error messages.

Reduced the number of threads in atomic parallel tests.

Author: jdantonio

Rakefile

@@ -1,9 +1,11 @@
-require 'rake'
 require 'bundler/gem_tasks'
 require 'rake/extensiontask'
 require 'rake/javaextensiontask'
 
-GEMSPEC = Gem::Specification.load(File.expand_path('../concurrent-ruby.gemspec', __FILE__))
+GEMSPEC = Gem::Specification.load('concurrent-ruby.gemspec')
+EXTENSION_NAME = 'concurrent_ruby_ext'
+
+Bundler::GemHelper.install_tasks
 
 $:.push File.join(File.dirname(__FILE__), 'lib')
 require 'extension_helper'
@@ -13,27 +15,21 @@ Dir.glob('tasks/**/*.rake').each do|rakefile|
   load rakefile
 end
 
-Bundler::GemHelper.install_tasks
-
 desc 'Run benchmarks'
 task :bench do
   exec 'ruby -Ilib -Iext examples/bench_atomic.rb'
 end
 
 if defined?(JRUBY_VERSION)
 
-  EXTENSION_NAME = 'concurrent_jruby'
-
   Rake::JavaExtensionTask.new(EXTENSION_NAME, GEMSPEC) do |ext|
     ext.ext_dir = 'ext'
   end
 
 elsif Concurrent.use_c_extensions?
 
-  EXTENSION_NAME = 'concurrent_cruby'
-
   Rake::ExtensionTask.new(EXTENSION_NAME, GEMSPEC) do |ext|
-    ext.ext_dir = 'ext'
+    ext.ext_dir = "ext/#{EXTENSION_NAME}"
     ext.cross_compile = true
     ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
   end
@@ -54,6 +50,10 @@ elsif Concurrent.use_c_extensions?
       end
     end
   end
+else
+  task :clean
+  task :compile
+  task "compile:#{EXTENSION_NAME}"
 end
 
 Rake::Task[:clean].enhance do
@@ -75,11 +75,7 @@ begin
     t.rspec_opts = '--tag ~@not_on_travis'
   end
 
-  if defined?(EXTENSION_NAME)
-    task :default => [:clean, "compile:#{EXTENSION_NAME}", :travis_spec]
-  else
-    task :default => [:clean, :travis_spec]
-  end
+  task :default => [:clean, :compile, :travis_spec]
 rescue LoadError
   puts 'Error loading Rspec rake tasks, probably building the gem...'
 end

concurrent-ruby.gemspec

@@ -23,10 +23,11 @@ Gem::Specification.new do |s|
   s.require_paths    = ['lib']
 
   if defined?(JRUBY_VERSION)
-    s.files = Dir['lib/concurrent_jruby.jar']
+    s.files += Dir['lib/concurrent_ruby_ext.jar']
     s.platform = 'java'
   else
-    s.extensions = 'ext/extconf.rb'
+    s.extensions = 'ext/concurrent_ruby_ext/extconf.rb'
+    s.files += Dir['ext/**/*.{h,c,cpp}']
   end
 
   s.required_ruby_version = '>= 1.9.3'

examples/bench_atomic.rb

@@ -10,7 +10,7 @@
 N = ARGV[1] ? ARGV[1].to_i : 100_000
 
 # number of threads for parallel test
-M = ARGV[0] ? ARGV[0].to_i : 100
+M = ARGV[0] ? ARGV[0].to_i : 10
 
 # list of platform-specific implementations
 ATOMICS = [

ext/ConcurrentJrubyService.java renamed to ext/ConcurrentRubyExtService.java

@@ -3,7 +3,7 @@
 import org.jruby.Ruby;
 import org.jruby.runtime.load.BasicLibraryService;
 
-public class ConcurrentJrubyService implements BasicLibraryService {
+public class ConcurrentRubyExtService implements BasicLibraryService {
     public boolean basicLoad(final Ruby runtime) throws IOException {
         new com.concurrent_ruby.ext.AtomicReferenceLibrary().load(runtime, false);
         return true;

ext/Makefile

@@ -1,22 +1,21 @@
 require 'fileutils'
 
-$:.push File.join(File.dirname(__FILE__), '../lib')
+$:.push File.join(File.dirname(__FILE__), '../../lib')
 require 'extension_helper'
 
-EXTENSION_NAME = 'concurrent_cruby'
+EXTENSION_NAME = 'concurrent_ruby_ext'
 
-if defined?(JRUBY_VERSION)
-  puts 'JRuby detected. Pure Java optimizations will be used.'
-elsif ! Concurrent.use_c_extensions?
-  puts 'C optimizations are only supported on MRI 2.0 and above.'
-else
-
-  def fake_build
-    # http://yorickpeterse.com/articles/hacking-extconf-rb/
-    FileUtils.touch(File.join(Dir.pwd, EXTENSION_NAME + '.' + RbConfig::CONFIG['DLEXT']))
-    $makefile_created = true
+def create_dummy_makefile
+  File.open('Makefile', 'w') do |f|
+    f.puts 'all:'
+    f.puts 'install:'
   end
+end
 
+if defined?(JRUBY_VERSION) || ! Concurrent.use_c_extensions? 
+  create_dummy_makefile
+  warn 'C optimizations are not supported on this version of Ruby.'
+else
   begin
 
     require 'mkmf'
@@ -54,7 +53,7 @@ def compiler_is_gcc
 
     create_makefile(EXTENSION_NAME)
   rescue
-    puts 'C optimizations are not supported on this version of Ruby.'
-    fake_build
+    create_dummy_makefile
+    warn 'C optimizations cannot be compiled on this version of Ruby.'
   end
 end

ext/atomic_reference.c renamed to ext/concurrent_ruby_ext/atomic_reference.c

@@ -7,9 +7,9 @@
 static VALUE rb_mConcurrent;
 static VALUE rb_cAtomic;
 
-// Init_concurrent_cruby
+// Init_concurrent_ruby_ext
 
-void Init_concurrent_cruby() {
+void Init_concurrent_ruby_ext() {
 
   // define modules and classes
   rb_mConcurrent = rb_define_module("Concurrent");

ext/atomic_reference.h renamed to ext/concurrent_ruby_ext/atomic_reference.h

@@ -11,7 +11,7 @@
 
   require "concurrent/atomic_reference/#{ruby_engine}"
 rescue LoadError
-  warn "#{__FILE__}:#{__LINE__}: unsupported Ruby engine `#{RUBY_ENGINE}', using less-efficient Atomic impl"
+  warn "Unsupported Ruby engine `#{RUBY_ENGINE}', using less-efficient Atomic impl"
 end
 
 if defined? Concurrent::JavaAtomic