summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-20 12:38:58 +0000
committerkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-20 12:38:58 +0000
commit42a81120e510c2c2fb7822ff4d5738db6ba392bf ()
tree3f6024dcb1fe3a3ca6b3fd613f436fd99c80c80c
parentd9d838a45beff13576e4fba42e0d5b611d0df706 (diff)
* 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
-rw-r--r--ChangeLog4
-rw-r--r--lib/shell.rb115
-rw-r--r--lib/shell/builtin-command.rb31
-rw-r--r--lib/shell/command-processor.rb87
-rw-r--r--lib/shell/error.rb4
-rw-r--r--lib/shell/process-controller.rb158
-rw-r--r--lib/shell/system-command.rb4
-rw-r--r--lib/shell/version.rb8
8 files changed, 270 insertions, 141 deletions
@@ -1,3 +1,7 @@
Tue Mar 20 16:36:08 2007 URABE Shyouhei <[email protected]>
* distruby.rb: Add zip generation.
@@ -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.)
#
# --
#
@@ -11,14 +11,17 @@
#
require "e2mmap"
-require "thread"
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 $-'
include Error
extend Exception2MessageMapper
@@ -30,7 +33,13 @@ class Shell
@debug = false
@verbose = true
class << Shell
attr_accessor :cascade, :debug, :verbose
# alias cascade? cascade
@@ -44,9 +53,7 @@ class Shell
end
def cd(path)
- sh = new
- sh.cd path
- sh
end
def default_system_path
@@ -72,12 +79,19 @@ class Shell
def default_record_separator=(rs)
@default_record_separator = rs
end
end
- def initialize
- @cwd = Dir.pwd
@dir_stack = []
- @umask = nil
@system_path = Shell.default_system_path
@record_separator = Shell.default_record_separator
@@ -126,49 +140,58 @@ class Shell
# Shell#mkdir
# Shell#rmdir
- attr :cwd
alias dir cwd
alias getwd cwd
alias pwd cwd
- attr :dir_stack
alias dirs dir_stack
# If called as iterator, it restores the current directory when the
# block ends.
- def chdir(path = nil)
if iterator?
cwd_old = @cwd
begin
- chdir(path)
yield
ensure
- chdir(cwd_old)
end
else
path = "~" unless path
@cwd = expand_path(path)
notify "current dir: #{@cwd}"
rehash
- self
end
end
alias cd chdir
- def pushdir(path = nil)
if iterator?
- pushdir(path)
begin
yield
ensure
popdir
end
elsif path
@dir_stack.push @cwd
- chdir path
notify "dir stack: [#{@dir_stack.join ', '}]"
self
else
if pop = @dir_stack.pop
@dir_stack.push @cwd
chdir pop
@@ -178,10 +201,14 @@ class Shell
Shell.Fail DirStackEmpty
end
end
end
alias pushd pushdir
def 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
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
else
- " " + mes
end
- }.join("\n")+"\n"
end
end
@@ -1,9 +1,9 @@
#
# shell/builtin-command.rb -
-# $Release Version: 0.6.0 $
# $Revision$
# $Date$
-# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
#
# --
#
@@ -22,6 +22,16 @@ class Shell
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)
rs = @shell.record_separator unless rs
- for f in @files
yield f+rs
end
end
@@ -1,9 +1,9 @@
#
# shell/command-controller.rb -
-# $Release Version: 0.6.0 $
# $Revision$
# $Date$
-# by Keiju ISHITSUKA(Nippon Rational Inc.)
#
# --
#
@@ -26,7 +26,13 @@ class Shell
#
# initialize of Shell and related classes.
#
- NoDelegateMethods = ["initialize", "expand_path"]
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)
path = expand_path(path)
if File.directory?(path)
- Dir.open(path)
else
- effect_umask do
- File.open(path, mode)
end
end
end
@@ -130,12 +143,15 @@ class Shell
# File#unlink (when path is file)
#
def unlink(path)
path = expand_path(path)
if File.directory?(path)
Dir.unlink(path)
else
IO.unlink(path)
end
end
#
@@ -155,6 +171,7 @@ class Shell
# sh[:exists?, "foo"]
# sh["exists?", "foo"]
#
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)
when String
if command.size == 1
if file2
@@ -194,9 +215,23 @@ class Shell
# same as Dir.mkdir()
#
def mkdir(*path)
for dir in path
- Dir.mkdir(expand_path(dir))
end
end
#
@@ -205,9 +240,13 @@ class Shell
# same as Dir.rmdir()
#
def rmdir(*path)
for dir in path
Dir.rmdir(expand_path(dir))
end
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?
- mes.gsub!("%pwd", "#{@cwd}")
- mes.gsub!("%cwd", "#{@cwd}")
- }
- end
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)
@system_commands[command] = path
return path
end
@@ -1,9 +1,9 @@
#
# shell/error.rb -
-# $Release Version: 0.6.0 $
# $Revision$
# $Date$
-# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
#
# --
#
@@ -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
@@ -1,9 +1,9 @@
#
# shell/system-command.rb -
-# $Release Version: 0.6.0 $
# $Revision$
# $Date$
-# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
#
# --
#
@@ -1,9 +1,9 @@
#
# version.rb - shell version definition file
-# $Release Version: 0.6.0$
# $Revision$
# $Date$
-# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
#
# --
#
@@ -11,6 +11,6 @@
#
class Shell
- @RELEASE_VERSION = "0.6.0"
- @LAST_UPDATE_DATE = "01/03/19"
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 20:01:01 +0000