diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/debug.rb | 2 | ||||
-rw-r--r-- | lib/drb/drb.rb | 4 | ||||
-rw-r--r-- | lib/drb/extservm.rb | 2 | ||||
-rw-r--r-- | lib/irb/workspace.rb | 2 | ||||
-rw-r--r-- | lib/monitor.rb | 4 | ||||
-rw-r--r-- | lib/mutex_m.rb | 2 | ||||
-rw-r--r-- | lib/pstore.rb | 2 | ||||
-rw-r--r-- | lib/resolv.rb | 8 | ||||
-rw-r--r-- | lib/rinda/ring.rb | 2 | ||||
-rw-r--r-- | lib/rinda/tuplespace.rb | 2 | ||||
-rw-r--r-- | lib/shell.rb | 4 | ||||
-rw-r--r-- | lib/shell/process-controller.rb | 16 | ||||
-rw-r--r-- | lib/shell/system-command.rb | 2 | ||||
-rw-r--r-- | lib/singleton.rb | 2 | ||||
-rw-r--r-- | lib/sync.rb | 2 | ||||
-rw-r--r-- | lib/thwait.rb | 2 | ||||
-rw-r--r-- | lib/tracer.rb | 2 | ||||
-rw-r--r-- | lib/webrick/httpauth/digestauth.rb | 2 | ||||
-rw-r--r-- | lib/webrick/httpauth/htdigest.rb | 2 | ||||
-rw-r--r-- | lib/webrick/server.rb | 2 | ||||
-rw-r--r-- | lib/webrick/utils.rb | 4 |
21 files changed, 34 insertions, 36 deletions
diff --git a/lib/debug.rb b/lib/debug.rb index 5d754d8ebb..394a53e172 100644 --- a/lib/debug.rb +++ b/lib/debug.rb @@ -182,7 +182,7 @@ SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__ # :nodoc: # Debug is not available in safe mode. class DEBUGGER__ - MUTEX = Mutex.new # :nodoc: + MUTEX = Thread::Mutex.new # :nodoc: class Context # :nodoc: DEBUG_LAST_CMD = [] diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index f00e72c457..38cb38563b 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -1205,7 +1205,7 @@ module DRb # not normally need to deal with it directly. class DRbConn POOL_SIZE = 16 # :nodoc: - @mutex = Mutex.new + @mutex = Thread::Mutex.new @pool = [] def self.open(remote_uri) # :nodoc: @@ -1824,7 +1824,7 @@ module DRb end module_function :install_acl - @mutex = Mutex.new + @mutex = Thread::Mutex.new def mutex # :nodoc: @mutex end diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb index e2637aa62c..7e70a3cd82 100644 --- a/lib/drb/extservm.rb +++ b/lib/drb/extservm.rb @@ -28,7 +28,7 @@ module DRb @cond = new_cond @servers = {} @waiting = [] - @queue = Queue.new + @queue = Thread::Queue.new @thread = invoke_thread @uri = nil end diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb index ac3e369430..16f714d66e 100644 --- a/lib/irb/workspace.rb +++ b/lib/irb/workspace.rb @@ -41,7 +41,7 @@ EOF unless defined? BINDING_QUEUE require "thread" - IRB.const_set(:BINDING_QUEUE, SizedQueue.new(1)) + IRB.const_set(:BINDING_QUEUE, Thread::SizedQueue.new(1)) Thread.abort_on_exception = true Thread.start do eval "require \"irb/ws-for-case-2\"", TOPLEVEL_BINDING, __FILE__, __LINE__ diff --git a/lib/monitor.rb b/lib/monitor.rb index 73741f8ddb..3ded0b3658 100644 --- a/lib/monitor.rb +++ b/lib/monitor.rb @@ -153,7 +153,7 @@ module MonitorMixin def initialize(monitor) @monitor = monitor - @cond = ::ConditionVariable.new + @cond = Thread::ConditionVariable.new end end @@ -241,7 +241,7 @@ module MonitorMixin def mon_initialize @mon_owner = nil @mon_count = 0 - @mon_mutex = Mutex.new + @mon_mutex = Thread::Mutex.new end def mon_check_owner diff --git a/lib/mutex_m.rb b/lib/mutex_m.rb index 627355151e..a8472f1582 100644 --- a/lib/mutex_m.rb +++ b/lib/mutex_m.rb @@ -102,7 +102,7 @@ module Mutex_m private def mu_initialize # :nodoc: - @_mutex = Mutex.new + @_mutex = Thread::Mutex.new end def initialize(*args) # :nodoc: diff --git a/lib/pstore.rb b/lib/pstore.rb index 66a919e189..87153ed2cd 100644 --- a/lib/pstore.rb +++ b/lib/pstore.rb @@ -128,7 +128,7 @@ class PStore @abort = false @ultra_safe = false @thread_safe = thread_safe - @lock = Mutex.new + @lock = Thread::Mutex.new end # Raises PStore::Error if the calling code is not in a PStore#transaction. diff --git a/lib/resolv.rb b/lib/resolv.rb index 9a981b99bd..ca4c7581ba 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -180,7 +180,7 @@ class Resolv def initialize(filename = DefaultFileName) @filename = filename - @mutex = Mutex.new + @mutex = Thread::Mutex.new @initialized = nil end @@ -334,7 +334,7 @@ class Resolv # :ndots => 1) def initialize(config_info=nil) - @mutex = Mutex.new + @mutex = Thread::Mutex.new @config = Config.new(config_info) @initialized = nil end @@ -625,7 +625,7 @@ class Resolv end RequestID = {} # :nodoc: - RequestIDMutex = Mutex.new # :nodoc: + RequestIDMutex = Thread::Mutex.new # :nodoc: def self.allocate_request_id(host, port) # :nodoc: id = nil @@ -910,7 +910,7 @@ class Resolv class Config # :nodoc: def initialize(config_info=nil) - @mutex = Mutex.new + @mutex = Thread::Mutex.new @config_info = config_info @initialized = nil @timeouts = nil diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb index 9ec8a2fb2f..9b3f13eb93 100644 --- a/lib/rinda/ring.rb +++ b/lib/rinda/ring.rb @@ -385,7 +385,7 @@ module Rinda # TupleSpaces can be found by calling +to_a+. def lookup_ring_any(timeout=5) - queue = Queue.new + queue = Thread::Queue.new Thread.new do self.lookup_ring(timeout) do |ts| diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb index e29bd63126..3ce8d2984f 100644 --- a/lib/rinda/tuplespace.rb +++ b/lib/rinda/tuplespace.rb @@ -246,7 +246,7 @@ module Rinda def initialize(place, event, tuple, expires=nil) ary = [event, Rinda::Template.new(tuple)] super(ary, expires) - @queue = Queue.new + @queue = Thread::Queue.new @done = false end diff --git a/lib/shell.rb b/lib/shell.rb index 8216eb2862..b0bdc8194f 100644 --- a/lib/shell.rb +++ b/lib/shell.rb @@ -12,8 +12,6 @@ require "e2mmap" -require "thread" unless defined?(Mutex) - require "forwardable" require "shell/error" @@ -100,7 +98,7 @@ class Shell @debug_display_process_id = false @debug_display_thread_id = true - @debug_output_mutex = Mutex.new + @debug_output_mutex = Thread::Mutex.new class << Shell extend Forwardable diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb index a100727aa6..a536ebd6ee 100644 --- a/lib/shell/process-controller.rb +++ b/lib/shell/process-controller.rb @@ -18,11 +18,11 @@ class Shell class ProcessController @ProcessControllers = {} - @ProcessControllersMonitor = Mutex.new - @ProcessControllersCV = ConditionVariable.new + @ProcessControllersMonitor = Thread::Mutex.new + @ProcessControllersCV = Thread::ConditionVariable.new - @BlockOutputMonitor = Mutex.new - @BlockOutputCV = ConditionVariable.new + @BlockOutputMonitor = Thread::Mutex.new + @BlockOutputCV = Thread::ConditionVariable.new class << self extend Forwardable @@ -97,8 +97,8 @@ class Shell @active_jobs = [] @jobs_sync = Sync.new - @job_monitor = Mutex.new - @job_condition = ConditionVariable.new + @job_monitor = Thread::Mutex.new + @job_condition = Thread::ConditionVariable.new end attr_reader :shell @@ -238,8 +238,8 @@ class Shell pid = nil - pid_mutex = Mutex.new - pid_cv = ConditionVariable.new + pid_mutex = Thread::Mutex.new + pid_cv = Thread::ConditionVariable.new Thread.start do ProcessController.block_output_synchronize do diff --git a/lib/shell/system-command.rb b/lib/shell/system-command.rb index 2a8ffd6ed9..81456e7db3 100644 --- a/lib/shell/system-command.rb +++ b/lib/shell/system-command.rb @@ -22,7 +22,7 @@ class Shell @command = command @opts = opts - @input_queue = Queue.new + @input_queue = Thread::Queue.new @pid = nil sh.process_controller.add_schedule(self) diff --git a/lib/singleton.rb b/lib/singleton.rb index 2ee9b5b3b5..deb0f52cd6 100644 --- a/lib/singleton.rb +++ b/lib/singleton.rb @@ -133,7 +133,7 @@ module Singleton def __init__(klass) # :nodoc: klass.instance_eval { @singleton__instance__ = nil - @singleton__mutex__ = Mutex.new + @singleton__mutex__ = Thread::Mutex.new } def klass.instance # :nodoc: return @singleton__instance__ if @singleton__instance__ diff --git a/lib/sync.rb b/lib/sync.rb index ad6caf0743..c95343594f 100644 --- a/lib/sync.rb +++ b/lib/sync.rb @@ -261,7 +261,7 @@ module Sync_m @sync_ex_locker = nil @sync_ex_count = 0 - @sync_mutex = Mutex.new + @sync_mutex = Thread::Mutex.new end def initialize(*args) diff --git a/lib/thwait.rb b/lib/thwait.rb index db7e6b1ce5..239915baef 100644 --- a/lib/thwait.rb +++ b/lib/thwait.rb @@ -51,7 +51,7 @@ class ThreadsWait # def initialize(*threads) @threads = [] - @wait_queue = Queue.new + @wait_queue = Thread::Queue.new join_nowait(*threads) unless threads.empty? end diff --git a/lib/tracer.rb b/lib/tracer.rb index fd45f003c8..24a5313f4c 100644 --- a/lib/tracer.rb +++ b/lib/tracer.rb @@ -91,7 +91,7 @@ class Tracer Tracer::display_thread_id = true Tracer::display_c_call = false - @stdout_mutex = Mutex.new + @stdout_mutex = Thread::Mutex.new # Symbol table used for displaying trace information EVENT_SYMBOL = { diff --git a/lib/webrick/httpauth/digestauth.rb b/lib/webrick/httpauth/digestauth.rb index 98bdbd10c7..375ec20154 100644 --- a/lib/webrick/httpauth/digestauth.rb +++ b/lib/webrick/httpauth/digestauth.rb @@ -111,7 +111,7 @@ module WEBrick @instance_key = hexdigest(self.__id__, Time.now.to_i, Process.pid) @opaques = {} @last_nonce_expire = Time.now - @mutex = Mutex.new + @mutex = Thread::Mutex.new end ## diff --git a/lib/webrick/httpauth/htdigest.rb b/lib/webrick/httpauth/htdigest.rb index 4bb25e1724..1ef4fdb4aa 100644 --- a/lib/webrick/httpauth/htdigest.rb +++ b/lib/webrick/httpauth/htdigest.rb @@ -38,7 +38,7 @@ module WEBrick @path = path @mtime = Time.at(0) @digest = Hash.new - @mutex = Mutex::new + @mutex = Thread::Mutex::new @auth_type = DigestAuth open(@path,"a").close unless File::exist?(@path) reload diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb index e2e99bfc5f..45bd9706d3 100644 --- a/lib/webrick/server.rb +++ b/lib/webrick/server.rb @@ -98,7 +98,7 @@ module WEBrick @config[:Logger] ||= Log::new @logger = @config[:Logger] - @tokens = SizedQueue.new(@config[:MaxClients]) + @tokens = Thread::SizedQueue.new(@config[:MaxClients]) @config[:MaxClients].times{ @tokens.push(nil) } webrickv = WEBrick::VERSION diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb index 846829b01f..eb3b907ecf 100644 --- a/lib/webrick/utils.rb +++ b/lib/webrick/utils.rb @@ -126,7 +126,7 @@ module WEBrick ## # Mutex used to synchronize access across threads - TimeoutMutex = Mutex.new # :nodoc: + TimeoutMutex = Thread::Mutex.new # :nodoc: ## # Registers a new timeout handler @@ -154,7 +154,7 @@ module WEBrick TimeoutMutex.synchronize{ @timeout_info = Hash.new } - @queue = Queue.new + @queue = Thread::Queue.new @watcher = nil end |