kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/shell: commit miss(support for ruby 1.9(YARV) thread model).

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
keiju 2007-03-22 15:25:58 +00:00
parent 0ce0d4a596
commit 69b8b645b5
4 changed files with 48 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Mar 23 00:24:52 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
* lib/shell: commit miss(support for ruby 1.9(YARV) thread model).
Thu Mar 22 13:32:17 2007 NAKAMURA Usaku <usa@ruby-lang.org> Thu Mar 22 13:32:17 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub (LIBS): remove an unnecessary library. * win32/Makefile.sub (LIBS): remove an unnecessary library.

36
lib/shell/command-processor.rb
View file

@ -589,24 +589,24 @@ class Shell
def_builtin_commands(FileTest, def_builtin_commands(FileTest,
FileTest.singleton_methods(false).collect{|m| [m, ["FILENAME"]]}) FileTest.singleton_methods(false).collect{|m| [m, ["FILENAME"]]})
# method related ftools # # method related ftools
normal_delegation_ftools_methods = [ # normal_delegation_ftools_methods = [
["syscopy", ["FILENAME_FROM", "FILENAME_TO"]], # ["syscopy", ["FILENAME_FROM", "FILENAME_TO"]],
["copy", ["FILENAME_FROM", "FILENAME_TO"]], # ["copy", ["FILENAME_FROM", "FILENAME_TO"]],
["move", ["FILENAME_FROM", "FILENAME_TO"]], # ["move", ["FILENAME_FROM", "FILENAME_TO"]],
["compare", ["FILENAME_FROM", "FILENAME_TO"]], # ["compare", ["FILENAME_FROM", "FILENAME_TO"]],
["safe_unlink", ["*FILENAMES"]], # ["safe_unlink", ["*FILENAMES"]],
["makedirs", ["*FILENAMES"]], # ["makedirs", ["*FILENAMES"]],
# ["chmod", ["mode", "*FILENAMES"]], # # ["chmod", ["mode", "*FILENAMES"]],
["install", ["FILENAME_FROM", "FILENAME_TO", "mode"]], # ["install", ["FILENAME_FROM", "FILENAME_TO", "mode"]],
] # ]
def_builtin_commands(File, # def_builtin_commands(File,
normal_delegation_ftools_methods) # normal_delegation_ftools_methods)
alias_method :cmp, :compare # alias_method :cmp, :compare
alias_method :mv, :move # alias_method :mv, :move
alias_method :cp, :copy # alias_method :cp, :copy
alias_method :rm_f, :safe_unlink # alias_method :rm_f, :safe_unlink
alias_method :mkpath, :makedirs # alias_method :mkpath, :makedirs
end end
end end

4
lib/shell/filter.rb
View file

@ -1,9 +1,9 @@
# #
# shell/filter.rb - # shell/filter.rb -
# $Release Version: 0.6.0 $ # $Release Version: 0.7 $
# $Revision$ # $Revision$
# $Date$ # $Date$
# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd) # by Keiju ISHITSUKA(keiju@ruby-lang.org)
# #
# -- # --
# #

34
lib/shell/system-command.rb
View file

@ -47,8 +47,11 @@ class Shell
end end
def start def start
notify([@command, *@opts].join(" "))
@pid, @pipe_in, @pipe_out = @shell.process_controller.sfork(self) { @pid, @pipe_in, @pipe_out = @shell.process_controller.sfork(self) {
Dir.chdir @shell.pwd Dir.chdir @shell.pwd
$0 = @command
exec(@command, *@opts) exec(@command, *@opts)
} }
if @input if @input
@ -78,17 +81,12 @@ class Shell
end end
end end
def start_import def start_import
# Thread.critical = true
notify "Job(%id) start imp-pipe.", @shell.debug? notify "Job(%id) start imp-pipe.", @shell.debug?
rs = @shell.record_separator unless rs rs = @shell.record_separator unless rs
_eop = true _eop = true
# Thread.critical = false
th = Thread.start { th = Thread.start {
Thread.critical = true
begin begin
Thread.critical = false
while l = @pipe_in.gets while l = @pipe_in.gets
@input_queue.push l @input_queue.push l
end end
@ -96,20 +94,16 @@ class Shell
rescue Errno::EPIPE rescue Errno::EPIPE
_eop = false _eop = false
ensure ensure
if _eop if !ProcessController::USING_AT_EXIT_WHEN_PROCESS_EXIT and _eop
notify("warn: Process finishing...", notify("warn: Process finishing...",
"wait for Job[%id] to finish pipe importing.", "wait for Job[%id] to finish pipe importing.",
"You can use Shell#transact or Shell#check_point for more safe execution.") "You can use Shell#transact or Shell#check_point for more safe execution.")
# Tracer.on
Thread.current.run
redo redo
end end
Thread.exclusive do
notify "job(%id}) close imp-pipe.", @shell.debug? notify "job(%id}) close imp-pipe.", @shell.debug?
@input_queue.push :EOF @input_queue.push :EOF
@pipe_in.close @pipe_in.close
end end
end
} }
end end
@ -117,26 +111,25 @@ class Shell
notify "job(%id) start exp-pipe.", @shell.debug? notify "job(%id) start exp-pipe.", @shell.debug?
_eop = true _eop = true
th = Thread.start{ th = Thread.start{
Thread.critical = true
begin begin
Thread.critical = false @input.each do |l|
@input.each{|l| @pipe_out.print l} ProcessController::block_output_synchronize do
@pipe_out.print l
end
end
_eop = false _eop = false
rescue Errno::EPIPE rescue Errno::EPIPE, Errno::EIO
_eop = false _eop = false
ensure ensure
if _eop if !ProcessController::USING_AT_EXIT_WHEN_PROCESS_EXIT and _eop
notify("shell: warn: Process finishing...", notify("shell: warn: Process finishing...",
"wait for Job(%id) to finish pipe exporting.", "wait for Job(%id) to finish pipe exporting.",
"You can use Shell#transact or Shell#check_point for more safe execution.") "You can use Shell#transact or Shell#check_point for more safe execution.")
# Tracer.on
redo redo
end end
Thread.exclusive do
notify "job(%id) close exp-pipe.", @shell.debug? notify "job(%id) close exp-pipe.", @shell.debug?
@pipe_out.close @pipe_out.close
end end
end
} }
end end
@ -154,14 +147,13 @@ class Shell
# mes: "job(%id) close pipe-out." # mes: "job(%id) close pipe-out."
# yorn: Boolean(@shell.debug? or @shell.verbose?) # yorn: Boolean(@shell.debug? or @shell.verbose?)
def notify(*opts, &block) def notify(*opts, &block)
Thread.exclusive do @shell.notify(*opts) do |mes|
@shell.notify(*opts) {|mes|
yield mes if iterator? yield mes if iterator?
mes.gsub!("%id", "#{@command}:##{@pid}") mes.gsub!("%id", "#{@command}:##{@pid}")
mes.gsub!("%name", "#{@command}") mes.gsub!("%name", "#{@command}")
mes.gsub!("%pid", "#{@pid}") mes.gsub!("%pid", "#{@pid}")
} mes
end end
end end
end end