aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-26 02:44:26 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-26 02:44:26 +0000
commit1f48a3382b41d3e30d020f179147a063ce4fa4ba (patch)
tree4a36ac22a5aa9d6aaeba53ae7b954b3f7c8522b6
parentf4e5a6f08374c4f12db75723ffbe003d35d4935d (diff)
downloadruby-1f48a3382b41d3e30d020f179147a063ce4fa4ba.tar.gz
* lib/shell/process-controller.rb: removed commented-out code.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/shell/process-controller.rb9
2 files changed, 4 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 96f3312f95..f4cffb581c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 26 11:44:04 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * lib/shell/process-controller.rb: removed commented-out code.
+
Tue Aug 26 11:39:01 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/thwait.rb (ThreadsWait): removed needless constant.
diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb
index b973539b4b..d0cad0ec05 100644
--- a/lib/shell/process-controller.rb
+++ b/lib/shell/process-controller.rb
@@ -157,19 +157,16 @@ class Shell
@waiting_jobs.delete command
else
command = @waiting_jobs.shift
-# command.notify "job(%id) pre-start.", @shell.debug?
return unless command
end
@active_jobs.push command
command.start
-# command.notify "job(%id) post-start.", @shell.debug?
# start all jobs that input from the job
for job in @waiting_jobs.dup
start_job(job) if job.input == command
end
-# command.notify "job(%id) post2-start.", @shell.debug?
end
end
@@ -254,7 +251,6 @@ class Shell
pid = fork {
Thread.list.each do |th|
-# th.kill unless [Thread.main, Thread.current].include?(th)
th.kill unless Thread.current == th
end
@@ -283,8 +279,6 @@ class Shell
rescue Errno::ECHILD
command.notify "warn: job(%id) was done already waitpid."
_pid = true
- # rescue
- # STDERR.puts $!
ensure
command.notify("Job(%id): Wait to finish when Process finished.", @shell.debug?)
# when the process ends, wait until the command terminates
@@ -296,11 +290,8 @@ class Shell
redo
end
-# command.notify "job(%id) pre-pre-finish.", @shell.debug?
@job_monitor.synchronize do
-# command.notify "job(%id) pre-finish.", @shell.debug?
terminate_job(command)
-# command.notify "job(%id) pre-finish2.", @shell.debug?
@job_condition.signal
command.notify "job(%id) finish.", @shell.debug?
end