diff options
| author | keiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-22 15:25:58 +0000 |
|---|---|---|
| committer | keiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-22 15:25:58 +0000 |
| commit | 69b8b645b5da1282423b2be663aedd0c52508ef6 () | |
| tree | 9f3a243dbfb8ac1a341adeb96cb32171bd428ee7 /lib/shell | |
| parent | 0ce0d4a596b5059d04f3f79f9c3244c1415782fd (diff) | |
* lib/shell: commit miss(support for ruby 1.9(YARV) thread model).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/shell/command-processor.rb | 38 | ||||
| -rw-r--r-- | lib/shell/filter.rb | 4 | ||||
| -rw-r--r-- | lib/shell/system-command.rb | 56 |
3 files changed, 45 insertions, 53 deletions
@@ -475,7 +475,7 @@ class Shell end] Shell.notify "Define #{meth}(#{arg_str})", Shell.debug? Shell.notify("Definition of #{meth}: ", d, - Shell.debug.kind_of?(Integer) && Shell.debug > 1) eval d end end @@ -589,24 +589,24 @@ class Shell def_builtin_commands(FileTest, FileTest.singleton_methods(false).collect{|m| [m, ["FILENAME"]]}) - # method related ftools - normal_delegation_ftools_methods = [ - ["syscopy", ["FILENAME_FROM", "FILENAME_TO"]], - ["copy", ["FILENAME_FROM", "FILENAME_TO"]], - ["move", ["FILENAME_FROM", "FILENAME_TO"]], - ["compare", ["FILENAME_FROM", "FILENAME_TO"]], - ["safe_unlink", ["*FILENAMES"]], - ["makedirs", ["*FILENAMES"]], - # ["chmod", ["mode", "*FILENAMES"]], - ["install", ["FILENAME_FROM", "FILENAME_TO", "mode"]], - ] - def_builtin_commands(File, - normal_delegation_ftools_methods) - alias_method :cmp, :compare - alias_method :mv, :move - alias_method :cp, :copy - alias_method :rm_f, :safe_unlink - alias_method :mkpath, :makedirs end end @@ -1,9 +1,9 @@ # # shell/filter.rb - -# $Release Version: 0.6.0 $ # $Revision$ # $Date$ -# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd) # # -- # @@ -47,12 +47,15 @@ class Shell end def start @pid, @pipe_in, @pipe_out = @shell.process_controller.sfork(self) { Dir.chdir @shell.pwd exec(@command, *@opts) } if @input - start_export end start_import end @@ -78,17 +81,12 @@ class Shell end end - def start_import -# Thread.critical = true notify "Job(%id) start imp-pipe.", @shell.debug? rs = @shell.record_separator unless rs _eop = true -# Thread.critical = false th = Thread.start { - Thread.critical = true begin - Thread.critical = false while l = @pipe_in.gets @input_queue.push l end @@ -96,19 +94,15 @@ class Shell rescue Errno::EPIPE _eop = false ensure - if _eop notify("warn: Process finishing...", "wait for Job[%id] to finish pipe importing.", "You can use Shell#transact or Shell#check_point for more safe execution.") -# Tracer.on - Thread.current.run redo end - Thread.exclusive do - notify "job(%id}) close imp-pipe.", @shell.debug? - @input_queue.push :EOF - @pipe_in.close - end end } end @@ -117,25 +111,24 @@ class Shell notify "job(%id) start exp-pipe.", @shell.debug? _eop = true th = Thread.start{ - Thread.critical = true begin - Thread.critical = false - @input.each{|l| @pipe_out.print l} _eop = false - rescue Errno::EPIPE _eop = false ensure - if _eop notify("shell: warn: Process finishing...", "wait for Job(%id) to finish pipe exporting.", "You can use Shell#transact or Shell#check_point for more safe execution.") -# Tracer.on redo end - Thread.exclusive do - notify "job(%id) close exp-pipe.", @shell.debug? - @pipe_out.close - end end } end @@ -154,14 +147,13 @@ class Shell # mes: "job(%id) close pipe-out." # yorn: Boolean(@shell.debug? or @shell.verbose?) def notify(*opts, &block) - Thread.exclusive do - @shell.notify(*opts) {|mes| - yield mes if iterator? - - mes.gsub!("%id", "#{@command}:##{@pid}") - mes.gsub!("%name", "#{@command}") - mes.gsub!("%pid", "#{@pid}") - } end end end |