Skip to content

Commit 3d476ce

Browse files
committed
Remove autoload usages
1 parent 40e045c commit 3d476ce

File tree

5 files changed

+25
-21
lines changed

5 files changed

+25
-21
lines changed

lib/concurrent/map.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
require 'thread'
22

33
module Concurrent
4-
autoload :JRubyMapBackend, 'concurrent/thread_safe/jruby_map_backend'
5-
autoload :MriMapBackend, 'concurrent/thread_safe/mri_map_backend'
6-
autoload :NonConcurrentMapBackend, 'concurrent/thread_safe/non_concurrent_map_backend'
7-
autoload :AtomicReferenceMapBackend, 'concurrent/thread_safe/atomic_reference_map_backend'
8-
autoload :SynchronizedMapBackend, 'concurrent/thread_safe/synchronized_map_backend'
9-
104
# @!visibility private
115
module ThreadSafe
126

137
# @!visibility private
148
MapBackend = if defined?(RUBY_ENGINE)
159
case RUBY_ENGINE
16-
when 'jruby'; JRubyMapBackend
17-
when 'ruby'; MriMapBackend
18-
when 'rbx'; AtomicReferenceMapBackend
10+
when 'jruby'
11+
JRubyMapBackend
12+
when 'ruby'
13+
require 'concurrent/thread_safe/mri_map_backend'
14+
MriMapBackend
15+
when 'rbx'
16+
require 'concurrent/thread_safe/atomic_reference_map_backend'
17+
AtomicReferenceMapBackend
1918
else
2019
warn 'Concurrent::Map: unsupported Ruby engine, using a fully synchronized Concurrent::Map implementation' if $VERBOSE
20+
require 'concurrent/thread_safe/synchronized_map_backend'
2121
SynchronizedMapBackend
2222
end
2323
else
@@ -31,7 +31,7 @@ module ThreadSafe
3131
# -- for instance, it does not necessarily retain ordering by insertion time as `Hash`
3232
# does. For most uses it should do fine though, and we recommend you consider
3333
# `Concurrent::Map` instead of `Concurrent::Hash` for your concurrency-safe hash needs.
34-
#
34+
#
3535
# > require 'concurrent'
3636
# >
3737
# > map = Concurrent::Map.new

lib/concurrent/thread_safe.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
require 'concurrent/utility/engine'
22
require 'concurrent/thread_safe/synchronized_delegator'
3+
require 'concurrent/map'
4+
require 'concurrent/thread_safe/util'
35

46
module Concurrent
5-
autoload :Map, 'concurrent/map'
6-
autoload :Util, 'concurrent/thread_safe/util'
77

88
# Various classes within allows for +nil+ values to be stored,
99
# so a special +NULL+ token is required to indicate the "nil-ness".

lib/concurrent/thread_safe/mri_map_backend.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
require 'concurrent/thread_safe/non_concurrent_map_backend'
2+
13
module Concurrent
24

35
# @!visibility private
46
module ThreadSafe
5-
7+
68
# @!visibility private
79
class MriMapBackend < NonConcurrentMapBackend
810

lib/concurrent/thread_safe/synchronized_map_backend.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
require 'concurrent/thread_safe/non_concurrent_map_backend'
2+
13
module Concurrent
24

35
# @!visibility private

lib/concurrent/thread_safe/util.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ module Util
99
FIXNUM_BIT_SIZE = (0.size * 8) - 2
1010
MAX_INT = (2 ** FIXNUM_BIT_SIZE) - 1
1111
CPU_COUNT = 16 # is there a way to determine this?
12-
13-
autoload :Tuple, 'concurrent/tuple'
14-
autoload :Adder, 'concurrent/thread_safe/util/adder'
15-
autoload :CheapLockable, 'concurrent/thread_safe/util/cheap_lockable'
16-
autoload :PowerOfTwoTuple, 'concurrent/thread_safe/util/power_of_two_tuple'
17-
autoload :Volatile, 'concurrent/thread_safe/util/volatile'
18-
autoload :Striped64, 'concurrent/thread_safe/util/striped64'
19-
autoload :XorShiftRandom, 'concurrent/thread_safe/util/xor_shift_random'
2012
end
2113
end
2214
end
15+
16+
require 'concurrent/tuple'
17+
require 'concurrent/thread_safe/util/volatile'
18+
require 'concurrent/thread_safe/util/striped64'
19+
require 'concurrent/thread_safe/util/adder'
20+
require 'concurrent/thread_safe/util/cheap_lockable'
21+
require 'concurrent/thread_safe/util/power_of_two_tuple'
22+

0 commit comments

Comments
 (0)