Preparation for the 1.0.0.pre1 release.

jdantonio · jdantonio · commit cd2530af4383 · 2015-08-19T19:05:49.000-04:00
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@
 
 MRI 1.9.3, 2.0, 2.1, 2.2, JRuby (1.9 mode), and Rubinius 2.x are supported.
 This gem should be fully compatible with any interpreter that is compliant with Ruby 1.9.3 or newer.
-Java 8 is required for JRuby (Java 7 support is deprecated in version 0.9 and will be removed in 1.0).
+Java 8 is preferred for JRuby but every Java version on which JRuby 9000 runs will be supported.
 
 ## Features & Documentation
 
diff --git a/examples/actor_stress_test.rb b/examples/actor_stress_test.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
+#$: << File.expand_path('../../lib', __FILE__)
 
 require 'benchmark'
 require 'optparse'
diff --git a/examples/at_exit_tester.rb b/examples/at_exit_tester.rb
diff --git a/examples/atomic_example.rb b/examples/atomic_example.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
+#$: << File.expand_path('../../lib', __FILE__)
 
 require 'concurrent/atomics'
 
diff --git a/examples/bench_atomic.rb b/examples/bench_atomic.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
+#$: << File.expand_path('../../lib', __FILE__)
 
 require 'benchmark'
 require 'rbconfig'
diff --git a/examples/bench_atomic_1.rb b/examples/bench_atomic_1.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
+#$: << File.expand_path('../../lib', __FILE__)
 
 require 'optparse'
 require 'thread'
diff --git a/examples/benchmark_atomic_boolean.rb b/examples/benchmark_atomic_boolean.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
+#$: << File.expand_path('../../lib', __FILE__)
 
 require 'concurrent/atomics'
 require 'benchmark'
diff --git a/examples/benchmark_atomic_fixnum.rb b/examples/benchmark_atomic_fixnum.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
+#$: << File.expand_path('../../lib', __FILE__)
 
 require 'concurrent/atomics'
 require 'benchmark'
diff --git a/examples/benchmark_lazy_and_delay.rb b/examples/benchmark_lazy_and_delay.rb
diff --git a/examples/benchmark_read_write_lock.rb b/examples/benchmark_read_write_lock.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
+#$: << File.expand_path('../../lib', __FILE__)
 
 require 'concurrent/atomic/read_write_lock'
 require 'benchmark'
diff --git a/examples/benchmark_structs.rb b/examples/benchmark_structs.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
+#$: << File.expand_path('../../lib', __FILE__)
 
 require 'benchmark'
 require 'concurrent'
diff --git a/examples/benchmark_thread_pool_implementations.rb b/examples/benchmark_thread_pool_implementations.rb
@@ -1,30 +1,25 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
+#$: << File.expand_path('../../lib', __FILE__)
 
 require 'benchmark'
 require 'concurrent/executors'
 
-COUNT = 1000
+COUNT = 10_000
 
+executors = [
+  [Concurrent::CachedThreadPool],
+  [Concurrent::FixedThreadPool, 10],
+  [Concurrent::SingleThreadExecutor],
+  [Concurrent::ThreadPoolExecutor]
+]
 if Concurrent.on_jruby?
-  EXECUTORS = [
-    [Concurrent::JavaCachedThreadPool],
-    [Concurrent::JavaFixedThreadPool, 10],
-    [Concurrent::JavaSingleThreadExecutor],
-    [Concurrent::JavaThreadPoolExecutor]
-  ]
-else
-  EXECUTORS = [
-    [Concurrent::CachedThreadPool],
-    [Concurrent::FixedThreadPool, 10],
-    [Concurrent::SingleThreadExecutor],
-    [Concurrent::ThreadPoolExecutor]
-  ]
+  executors << [Concurrent::SingleThreadExecutor]
+  executors << [Concurrent::RubyThreadPoolExecutor]
 end
 
 Benchmark.bmbm do |x|
-  EXECUTORS.each do |executor_class, *args|
+  executors.each do |executor_class, *args|
     x.report(executor_class.to_s) do
       if args.empty?
         executor = executor_class.new
diff --git a/examples/graph_atomic_bench.rb b/examples/graph_atomic_bench.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
+#$: << File.expand_path('../../lib', __FILE__)
 
 require 'optparse'
 
diff --git a/examples/test_clock_variations.rb b/examples/test_clock_variations.rb
diff --git a/examples/thread_local_memory_usage.rb b/examples/thread_local_memory_usage.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
+#$: << File.expand_path('../../lib', __FILE__)
 
 $DEBUG_TLV = true
 require 'concurrent'
diff --git a/examples/thread_local_var_bench.rb b/examples/thread_local_var_bench.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
+#$: << File.expand_path('../../lib', __FILE__)
 
 require 'concurrent'
 require 'concurrent/atomic/thread_local_var'
diff --git a/lib/concurrent/delay.rb b/lib/concurrent/delay.rb
@@ -1,4 +1,5 @@
 require 'thread'
+require 'concurrent/configuration'
 require 'concurrent/concern/obligation'
 require 'concurrent/executor/executor'
 require 'concurrent/executor/immediate_executor'
diff --git a/lib/concurrent/executor/executor.rb b/lib/concurrent/executor/executor.rb
@@ -1,5 +1,5 @@
-require 'concurrent/configuration'
-require 'concurrent/executor/executor_service'
+# This file has circular require issues. For now we assume all
+# necessary dependencies have been required already.
 
 module Concurrent
 
diff --git a/lib/concurrent/scheduled_task.rb b/lib/concurrent/scheduled_task.rb
@@ -1,4 +1,5 @@
 require 'concurrent/errors'
+require 'concurrent/configuration'
 require 'concurrent/ivar'
 require 'concurrent/collection/copy_on_notify_observer_set'
 require 'concurrent/executor/executor'
