diff options
author | keiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-20 12:38:58 +0000 |
---|---|---|
committer | keiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-20 12:38:58 +0000 |
commit | 42a81120e510c2c2fb7822ff4d5738db6ba392bf (patch) | |
tree | 3f6024dcb1fe3a3ca6b3fd613f436fd99c80c80c /lib | |
parent | d9d838a45beff13576e4fba42e0d5b611d0df706 (diff) | |
download | ruby-42a81120e510c2c2fb7822ff4d5738db6ba392bf.tar.gz |
* lib/shell.rb, lib/shell: support for ruby 1.9(YARV) thread model.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/shell.rb | 115 | ||||
-rw-r--r-- | lib/shell/builtin-command.rb | 31 | ||||
-rw-r--r-- | lib/shell/command-processor.rb | 87 | ||||
-rw-r--r-- | lib/shell/error.rb | 4 | ||||
-rw-r--r-- | lib/shell/process-controller.rb | 158 | ||||
-rw-r--r-- | lib/shell/system-command.rb | 4 | ||||
-rw-r--r-- | lib/shell/version.rb | 8 |
7 files changed, 266 insertions, 141 deletions
diff --git a/lib/shell.rb b/lib/shell.rb index 9c6847c623..b18d8e3cae 100644 --- a/lib/shell.rb +++ b/lib/shell.rb @@ -1,9 +1,9 @@ # # shell.rb - -# $Release Version: 0.6.0 $ -# $Revision: 1.8 $ -# $Date: 2001/03/19 09:01:11 $ -# by Keiju ISHITSUKA(Nippon Rational Inc.) +# $Release Version: 0.7 $ +# $Revision: 1.9 $ +# $Date: 2002/03/04 12:01:10 $ +# by Keiju ISHITSUKA(keiju@ruby-lang.org) # # -- # @@ -11,14 +11,17 @@ # require "e2mmap" -require "thread" + +require "thread" unless defined?(Mutex) + +require "forwardable" require "shell/error" require "shell/command-processor" require "shell/process-controller" class Shell - @RCS_ID='-$Id: shell.rb,v 1.8 2001/03/19 09:01:11 keiju Exp keiju $-' + @RCS_ID='-$Id: shell.rb,v 1.9 2002/03/04 12:01:10 keiju Exp keiju $-' include Error extend Exception2MessageMapper @@ -30,7 +33,13 @@ class Shell @debug = false @verbose = true + @debug_display_process_id = false + @debug_display_thread_id = true + @debug_output_mutex = Mutex.new + class << Shell + extend Forwardable + attr_accessor :cascade, :debug, :verbose # alias cascade? cascade @@ -44,9 +53,7 @@ class Shell end def cd(path) - sh = new - sh.cd path - sh + new(path) end def default_system_path @@ -72,12 +79,19 @@ class Shell def default_record_separator=(rs) @default_record_separator = rs end + + # os resource mutecs + mutex_methods = ["unlock", "lock", "locked?", "synchronize", "try_lock", "exclusive_unlock"] + for m in mutex_methods + def_delegator("@debug_output_mutex", m, "debug_output_"+m.to_s) + end + end - def initialize - @cwd = Dir.pwd + def initialize(pwd = Dir.pwd, umask = nil) + @cwd = File.expand_path(pwd) @dir_stack = [] - @umask = nil + @umask = umask @system_path = Shell.default_system_path @record_separator = Shell.default_record_separator @@ -126,49 +140,58 @@ class Shell # Shell#mkdir # Shell#rmdir - attr :cwd + attr_reader :cwd alias dir cwd alias getwd cwd alias pwd cwd - attr :dir_stack + attr_reader :dir_stack alias dirs dir_stack # If called as iterator, it restores the current directory when the # block ends. - def chdir(path = nil) + def chdir(path = nil, verbose = @verbose) + check_point + if iterator? + notify("chdir(with block) #{path}") if verbose cwd_old = @cwd begin - chdir(path) + chdir(path, nil) yield ensure - chdir(cwd_old) + chdir(cwd_old, nil) end else + notify("chdir #{path}") if verbose path = "~" unless path @cwd = expand_path(path) notify "current dir: #{@cwd}" rehash - self + Void.new(self) end end alias cd chdir - def pushdir(path = nil) + def pushdir(path = nil, verbose = @verbose) + check_point + if iterator? - pushdir(path) + notify("pushdir(with block) #{path}") if verbose + pushdir(path, nil) begin yield ensure popdir end elsif path + notify("pushdir #{path}") if verbose @dir_stack.push @cwd - chdir path + chdir(path, nil) notify "dir stack: [#{@dir_stack.join ', '}]" self else + notify("pushdir") if verbose if pop = @dir_stack.pop @dir_stack.push @cwd chdir pop @@ -178,10 +201,14 @@ class Shell Shell.Fail DirStackEmpty end end + Void.new(self) end alias pushd pushdir def popdir + check_point + + notify("popdir") if pop = @dir_stack.pop chdir pop notify "dir stack: [#{@dir_stack.join ', '}]" @@ -189,10 +216,10 @@ class Shell else Shell.Fail DirStackEmpty end + Void.new(self) end alias popd popdir - # # process management # @@ -237,25 +264,35 @@ class Shell end def self.notify(*opts, &block) - Thread.exclusive do - if opts[-1].kind_of?(String) - yorn = verbose? - else - yorn = opts.pop - end - return unless yorn - - _head = true - print opts.collect{|mes| - mes = mes.dup - yield mes if iterator? - if _head - _head = false - "shell: " + mes + Shell::debug_output_synchronize do + if opts[-1].kind_of?(String) + yorn = verbose? + else + yorn = opts.pop + end + return unless yorn + + if @debug_display_thread_id + if @debug_display_process_id + prefix = "shell(##{Process.pid}:#{Thread.current.to_s.sub("Thread", "Th")}): " + else + prefix = "shell(#{Thread.current.to_s.sub("Thread", "Th")}): " + end else - " " + mes + prefix = "shell: " end - }.join("\n")+"\n" + _head = true + STDERR.print opts.collect{|mes| + mes = mes.dup + yield mes if iterator? + if _head + _head = false +# "shell" " + mes + prefix + mes + else + " "* prefix.size + mes + end + }.join("\n")+"\n" end end diff --git a/lib/shell/builtin-command.rb b/lib/shell/builtin-command.rb index db1adfa48b..cfdbc046aa 100644 --- a/lib/shell/builtin-command.rb +++ b/lib/shell/builtin-command.rb @@ -1,9 +1,9 @@ # # shell/builtin-command.rb - -# $Release Version: 0.6.0 $ +# $Release Version: 0.7 $ # $Revision$ # $Date$ -# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd) +# by Keiju ISHITSUKA(keiju@ruby-lang.org) # # -- # @@ -22,6 +22,16 @@ class Shell end end + class Void < BuiltInCommand + def initialize(sh, *opts) + super sh + end + + def each(rs = nil) + # do nothing + end + end + class Echo < BuiltInCommand def initialize(sh, *strings) super sh @@ -58,20 +68,17 @@ class Shell super sh @pattern = pattern - Thread.critical = true - back = Dir.pwd - begin - Dir.chdir @shell.cwd - @files = Dir[pattern] - ensure - Dir.chdir back - Thread.critical = false - end end def each(rs = nil) + if @pattern[0] == ?/ + @files = Dir[@pattern] + else + prefix = @shell.pwd+"/" + @files = Dir[prefix+@pattern].collect{|p| p.sub(prefix, "")} + end rs = @shell.record_separator unless rs - for f in @files + for f in @files yield f+rs end end diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb index ecf6c7d5eb..3514feb6ce 100644 --- a/lib/shell/command-processor.rb +++ b/lib/shell/command-processor.rb @@ -1,9 +1,9 @@ # # shell/command-controller.rb - -# $Release Version: 0.6.0 $ +# $Release Version: 0.7 $ # $Revision$ # $Date$ -# by Keiju ISHITSUKA(Nippon Rational Inc.) +# by Keiju ISHITSUKA(keiju@ruby-lang.org) # # -- # @@ -26,7 +26,13 @@ class Shell # # initialize of Shell and related classes. # - NoDelegateMethods = ["initialize", "expand_path"] + m = [:initialize, :expand_path] + if Object.methods.first.kind_of?(String) + NoDelegateMethods = m.collect{|m| m.id2name} + else + NoDelegateMethods = m + end + def self.initialize install_builtin_commands @@ -111,13 +117,20 @@ class Shell # Dir#open (when path is directory) # mode has an effect only when path is a file # - def open(path, mode) + def open(path, mode = nil, perm = 0666, &b) path = expand_path(path) if File.directory?(path) - Dir.open(path) + Dir.open(path, &b) else - effect_umask do - File.open(path, mode) + if @shell.umask + f = File.open(path, mode, perm) + File.chmod(perm & ~@shell.umask, path) + if block_given? + f.each &b + end + f + else + f = File.open(path, mode, perm, &b) end end end @@ -130,12 +143,15 @@ class Shell # File#unlink (when path is file) # def unlink(path) + @shell.check_point + path = expand_path(path) if File.directory?(path) Dir.unlink(path) else IO.unlink(path) end + Void.new(@shell) end # @@ -155,6 +171,7 @@ class Shell # sh[:exists?, "foo"] # sh["exists?", "foo"] # + alias top_level_test test def test(command, file1, file2=nil) file1 = expand_path(file1) file2 = expand_path(file2) if file2 @@ -162,7 +179,11 @@ class Shell case command when Integer - top_level_test(command, file1, file2) + if file2 + top_level_test(command, file1, file2) + else + top_level_test(command, file1) + end when String if command.size == 1 if file2 @@ -194,9 +215,23 @@ class Shell # same as Dir.mkdir() # def mkdir(*path) + @shell.check_point + notify("mkdir #{path.join(' ')}") + + perm = nil + if path.last.kind_of?(Integer) + perm = path.pop + end for dir in path - Dir.mkdir(expand_path(dir)) + d = expand_path(dir) + if perm + Dir.mkdir(d, perm) + else + Dir.mkdir(d) + end + File.chmod(d, 0666 & ~@shell.umask) if @shell.umask end + Void.new(@shell) end # @@ -205,9 +240,13 @@ class Shell # same as Dir.rmdir() # def rmdir(*path) + @shell.check_point + notify("rmdir #{path.join(' ')}") + for dir in path Dir.rmdir(expand_path(dir)) end + Void.new(@shell) end # @@ -299,35 +338,17 @@ class Shell # %pwd, %cwd -> @pwd def notify(*opts, &block) - Thread.exclusive do - Shell.notify(*opts) {|mes| - yield mes if iterator? + Shell.notify(*opts) {|mes| + yield mes if iterator? - mes.gsub!("%pwd", "#{@cwd}") - mes.gsub!("%cwd", "#{@cwd}") - } - end + mes.gsub!("%pwd", "#{@cwd}") + mes.gsub!("%cwd", "#{@cwd}") + } end # # private functions # - def effect_umask - if @shell.umask - Thread.critical = true - save = File.umask - begin - yield - ensure - File.umask save - Thread.critical = false - end - else - yield - end - end - private :effect_umask - def find_system_command(command) return command if /^\// =~ command case path = @system_commands[command] @@ -343,7 +364,7 @@ class Shell for p in @shell.system_path path = join(p, command) - if FileTest.exists?(path) + if FileTest.exist?(path) @system_commands[command] = path return path end diff --git a/lib/shell/error.rb b/lib/shell/error.rb index d338b1c5d1..97df30b3c2 100644 --- a/lib/shell/error.rb +++ b/lib/shell/error.rb @@ -1,9 +1,9 @@ # # shell/error.rb - -# $Release Version: 0.6.0 $ +# $Release Version: 0.7 $ # $Revision$ # $Date$ -# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd) +# by Keiju ISHITSUKA(keiju@ruby-lang.org) # # -- # diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb index 8929805506..c38d8bc987 100644 --- a/lib/shell/process-controller.rb +++ b/lib/shell/process-controller.rb @@ -1,33 +1,38 @@ # # shell/process-controller.rb - -# $Release Version: 0.6.0 $ +# $Release Version: 0.7 $ # $Revision$ # $Date$ -# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd) +# by Keiju ISHITSUKA(keiju@ruby-lang.org) # # -- # # # +require "forwardable" -require "mutex_m" -require "monitor" +require "thread" require "sync" class Shell class ProcessController @ProcessControllers = {} - @ProcessControllers.extend Mutex_m + @ProcessControllersMonitor = Mutex.new + @ProcessControllersCV = ConditionVariable.new + + @BlockOutputMonitor = Mutex.new + @BlockOutputCV = ConditionVariable.new class<<self + extend Forwardable - def process_controllers_exclusive - begin - @ProcessControllers.lock unless Thread.critical - yield - ensure - @ProcessControllers.unlock unless Thread.critical + def_delegator("@ProcessControllersMonitor", + "synchronize", "process_controllers_exclusive") + + def active_process_controllers + process_controllers_exclusive do + @ProcessControllers.dup end end @@ -43,6 +48,7 @@ class Shell if @ProcessControllers[pc] if (@ProcessControllers[pc] -= 1) == 0 @ProcessControllers.delete(pc) + @ProcessControllersCV.signal end end end @@ -55,6 +61,34 @@ class Shell end end end + + def block_output_synchronize(&b) + @BlockOutputMonitor.synchronize &b + end + + def wait_to_finish_all_process_controllers + process_controllers_exclusive do + while !@ProcessControllers.empty? + Shell::notify("Process finishing, but active shell exists", + "You can use Shell#transact or Shell#check_point for more safe execution.") + if Shell.debug? + for pc in @ProcessControllers.keys + Shell::notify(" Not finished jobs in "+pc.shell.to_s) + for com in pc.jobs + com.notify(" Jobs: %id") + end + end + end + @ProcessControllersCV.wait(@ProcessControllersMonitor) + end + end + end + end + + # for shell-command complete finish at this prosess exit. + USING_AT_EXIT_WHEN_PROCESS_EXIT = true + at_exit do + wait_to_finish_all_process_controllers unless $@ end def initialize(shell) @@ -67,6 +101,8 @@ class Shell @job_condition = ConditionVariable.new end + attr_reader :shell + def jobs jobs = [] @jobs_sync.synchronize(:SH) do @@ -122,15 +158,19 @@ 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 + for job in @waiting_jobs.dup start_job(job) if job.input == command end +# command.notify "job(%id) post2-start.", @shell.debug? end end @@ -152,6 +192,7 @@ class Shell @active_jobs.delete command ProcessController.inactivate(self) if @active_jobs.empty? + command.notify("start_jon in ierminate_jon(%id)", Shell::debug?) start_job end end @@ -159,7 +200,7 @@ class Shell # kill a job def kill_job(sig, command) - @jobs_sync.synchronize(:SH) do + @jobs_sync.synchronize(:EX) 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) + for job in jobs + job.notify("waiting job(%id)", Shell::debug?) + end 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) + pid = nil + pid_mutex = Mutex.new + pid_cv = ConditionVariable.new - ObjectSpace.each_object(IO) do |io| - if ![STDIN, STDOUT, STDERR].include?(io) - io.close unless io.closed? + Thread.start do + ProcessController.block_output_synchronize do + STDOUT.flush + ProcessController.each_active_object do |pc| + for jobs in pc.active_jobs + jobs.flush + end end + + pid = fork { + Thread.list.each do |th| +# th.kill unless [Thread.main, Thread.current].include?(th) + th.kill unless Thread.current == 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 + } end - yield - } + pid_cv.signal - pipe_peer_in.close - pipe_peer_out.close - command.notify "job(%name:##{pid}) start", @shell.debug? - Thread.critical = false + pipe_peer_in.close + pipe_peer_out.close + command.notify "job(%name:##{pid}) start", @shell.debug? - 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 + # rescue + # STDERR.puts $! ensure + command.notify("Job(%id): Wait to finish when Process finished.", @shell.debug?) # when the process ends, wait until the command termintes - if _pid + if USING_AT_EXIT_WHEN_PROCESS_EXIT or _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 + +# 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 end - } + end + + pid_mutex.synchronize do + while !pid + pid_cv.wait(pid_mutex) + end + end + return pid, pipe_me_in, pipe_me_out end end diff --git a/lib/shell/system-command.rb b/lib/shell/system-command.rb index f87ba890ea..cefa5d6e5a 100644 --- a/lib/shell/system-command.rb +++ b/lib/shell/system-command.rb @@ -1,9 +1,9 @@ # # shell/system-command.rb - -# $Release Version: 0.6.0 $ +# $Release Version: 0.7 $ # $Revision$ # $Date$ -# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd) +# by Keiju ISHITSUKA(keiju@ruby-lang.org) # # -- # diff --git a/lib/shell/version.rb b/lib/shell/version.rb index 6694c804d8..e40aa03abb 100644 --- a/lib/shell/version.rb +++ b/lib/shell/version.rb @@ -1,9 +1,9 @@ # # version.rb - shell version definition file -# $Release Version: 0.6.0$ +# $Release Version: 0.7$ # $Revision$ # $Date$ -# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd) +# by Keiju ISHITSUKA(keiju@ruby-lang.org) # # -- # @@ -11,6 +11,6 @@ # class Shell - @RELEASE_VERSION = "0.6.0" - @LAST_UPDATE_DATE = "01/03/19" + @RELEASE_VERSION = "0.7" + @LAST_UPDATE_DATE = "07/03/20" end |