Skip to content

Commit 0e05809

Browse files
committed
Merge pull request #316 from ruby-concurrency/internal-reorg
Organize Utility module
2 parents e3bb86f + c8ee4b5 commit 0e05809

23 files changed

+263
-252
lines changed

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
$:.push File.join(File.dirname(__FILE__), 'lib')
44

55
require 'concurrent/version'
6-
require 'concurrent/native_extensions'
6+
require 'concurrent/utility/native_extension_loader'
77

88
## load the two gemspec files
99
CORE_GEMSPEC = Gem::Specification.load('concurrent-ruby.gemspec')

ext/concurrent/extconf.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'fileutils'
22

3-
require 'concurrent/native_extensions'
3+
require 'concurrent/utility/native_extension_loader'
44

55
EXTENSION_NAME = 'extension'
66

lib/concurrent.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
require 'concurrent/version'
22

33
require 'concurrent/synchronization'
4-
require 'concurrent/at_exit'
54

65
require 'concurrent/configuration'
76

lib/concurrent/atomic/atomic_boolean.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'concurrent/native_extensions'
1+
require 'concurrent/utility/native_extension_loader'
22
require 'concurrent/synchronization'
33

44
module Concurrent

lib/concurrent/atomic/atomic_fixnum.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'concurrent/native_extensions'
1+
require 'concurrent/utility/native_extension_loader'
22
require 'concurrent/synchronization'
33

44
module Concurrent

lib/concurrent/atomic/atomic_reference.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'concurrent/native_extensions'
1+
require 'concurrent/utility/native_extension_loader'
22
require 'concurrent/utility/engine'
33
require 'concurrent/atomic_reference/concurrent_update_error'
44
require 'concurrent/atomic_reference/mutex_atomic'

lib/concurrent/atomic_reference/jruby.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'concurrent/native_extensions'
1+
require 'concurrent/utility/native_extension_loader'
22

33
if defined?(Concurrent::JavaAtomicReference)
44
require 'concurrent/atomic_reference/direct_update'

lib/concurrent/atomic_reference/ruby.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if defined? Concurrent::CAtomicReference
2-
require 'concurrent/native_extensions'
2+
require 'concurrent/utility/native_extension_loader'
33
require 'concurrent/atomic_reference/direct_update'
44
require 'concurrent/atomic_reference/numeric_cas_wrapper'
55

lib/concurrent/configuration.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
require 'thread'
22
require 'concurrent/atomics'
33
require 'concurrent/errors'
4-
require 'concurrent/at_exit'
54
require 'concurrent/executors'
6-
require 'concurrent/utility/processor_count'
5+
require 'concurrent/utility/at_exit'
6+
require 'concurrent/utility/processor_counter'
77
require 'concurrent/utility/deprecation'
88

99
module Concurrent

lib/concurrent/executor/executor_service.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
require 'concurrent/errors'
22
require 'concurrent/logging'
3-
require 'concurrent/at_exit'
43
require 'concurrent/atomic/event'
54
require 'concurrent/synchronization'
5+
require 'concurrent/utility/at_exit'
66
require 'concurrent/utility/deprecation'
77

88
module Concurrent

0 commit comments

Comments
 (0)