1 files changed, 109 insertions, 49 deletions
@@ -1,33 +1,38 @@
 #
 # shell/process-controller.rb -
-# $Release Version: 0.6.0 $
 # $Revision$
 # $Date$
-# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
 #
 # --
 #
 #
 #
-require "mutex_m"
-require "monitor"
 require "sync"
 class Shell
 class ProcessController
 @ProcessControllers = {}
- @ProcessControllers.extend Mutex_m
 class<<self
- def process_controllers_exclusive
-	begin
- @ProcessControllers.lock unless Thread.critical
- yield
-	ensure
- @ProcessControllers.unlock unless Thread.critical
 end
 end
@@ -43,6 +48,7 @@ class Shell
 if @ProcessControllers[pc]
 if (@ProcessControllers[pc] -= 1) == 0
 @ProcessControllers.delete(pc)
 end
 end
 end
@@ -55,6 +61,34 @@ class Shell
 end
 end
 end
 end
 def initialize(shell)
@@ -67,6 +101,8 @@ class Shell
 @job_condition = ConditionVariable.new
 end
 def jobs
 jobs = []
 @jobs_sync.synchronize(:SH) do
@@ -122,15 +158,19 @@ class Shell
 @waiting_jobs.delete command
 else
 command = @waiting_jobs.shift
 return unless command
 end
 @active_jobs.push command
 command.start
 # start all jobs that input from the job
-	for job in @waiting_jobs
 start_job(job) if job.input == command
 end
 end
 end
@@ -152,6 +192,7 @@ class Shell
 @active_jobs.delete command
 ProcessController.inactivate(self)
 if @active_jobs.empty?
 start_job
 end
 end
@@ -159,7 +200,7 @@ class Shell
 # kill a job
 def kill_job(sig, command)
- @jobs_sync.synchronize(:SH) do
 if @waiting_jobs.delete command
 ProcessController.inactivate(self)
 return
@@ -183,6 +224,9 @@ class Shell
 begin
 while !jobs.empty?
 @job_condition.wait(@job_monitor)
 end
 ensure
 redo unless jobs.empty?
@@ -194,66 +238,82 @@ class Shell
 def sfork(command, &block)
 pipe_me_in, pipe_peer_out = IO.pipe
 pipe_peer_in, pipe_me_out = IO.pipe
- Thread.critical = true
- STDOUT.flush
- ProcessController.each_active_object do |pc|
-	for jobs in pc.active_jobs
- jobs.flush
-	end
- end
-
- pid = fork {
-	Thread.critical = true
-
-	Thread.list.each do |th|
- th.kill unless [Thread.main, Thread.current].include?(th)
-	end
-	STDIN.reopen(pipe_peer_in)
-	STDOUT.reopen(pipe_peer_out)
-	ObjectSpace.each_object(IO) do |io|
- if ![STDIN, STDOUT, STDERR].include?(io)
- io.close unless io.closed?
 end
 end
-	yield
- }
- pipe_peer_in.close
- pipe_peer_out.close
- command.notify "job(%name:##{pid}) start", @shell.debug?
- Thread.critical = false
- th = Thread.start {
-	Thread.critical = true
 begin
 _pid = nil
 command.notify("job(%id) start to waiting finish.", @shell.debug?)
- Thread.critical = false
 _pid = Process.waitpid(pid, nil)
 rescue Errno::ECHILD
 command.notify "warn: job(%id) was done already waitipd."
 _pid = true
 ensure
 # when the process ends, wait until the command termintes
- if _pid
 else
 command.notify("notice: Process finishing...",
 "wait for Job[%id] to finish.",
 "You can use Shell#transact or Shell#check_point for more safe execution.")
 redo
 end
- Thread.exclusive do
- @job_monitor.synchronize do
- terminate_job(command)
- @job_condition.signal
- command.notify "job(%id) finish.", @shell.debug?
- end
 end
 end
- }
 return pid, pipe_me_in, pipe_me_out
 end
 end