diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-30 06:22:30 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-30 06:22:30 +0000 |
| commit | 7e24aacf8bd3f6bc45ba7d42263d70dae33d5b24 (patch) | |
| tree | 163674f4123bf461a86b4f6fd1de964297057bae /lib/shell | |
| parent | f48dbbf07455ee4362003c8ecc19612a4d6769d4 (diff) | |
| download | ruby-7e24aacf8bd3f6bc45ba7d42263d70dae33d5b24.tar.gz | |
Use qualified names
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/shell')
| -rw-r--r-- | lib/shell/process-controller.rb | 16 | ||||
| -rw-r--r-- | lib/shell/system-command.rb | 2 |
2 files changed, 9 insertions, 9 deletions
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) |