Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RFC: process redirections #1271

Merged
merged 2 commits into from
Sep 12, 2012
Merged

RFC: process redirections #1271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fac72b
Added process redirections to/from files
carlobaldassi Sep 9, 2012
0bc3c19
process: added here-strings, more redir operators
carlobaldassi Jul 8, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions base/export.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,14 @@ export
>,
>=,
>>,
.>>,
.<<,
>>>,
<<<,
&>,
&>>,
&<,
&<<,
\,
^,
|,
Expand Down
203 changes: 191 additions & 12 deletions base/process.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,42 @@ function exec(thunk::Function)
exit(0)
end

type FileSink
s::IOStream
own::Bool
function FileSink(s::IOStream, own::Bool)
if fd(s) == -1
error("Cannot use the given IOStream as FileSink")
end
this = new(s, own)
if own
finalizer(this, close_sink)
end
return this
end
end

FileSink(s::IOStream) = FileSink(s, false)

function FileSink(filename::String, args...)
s = open(filename, args...)
return FileSink(s, true)
end

function close_sink(sink::FileSink)
if sink.own
close(sink.s)
end
end

fd(sink::FileSink) = fd(sink.s)

type Cmd
exec::Executable
name::String
pipes::Dict{FileDes,PipeEnd}
sinks::Dict{FileDes,FileSink}
closed_fds::Vector{FileDes}
pipeline::Set{Cmd}
pid::Int32
status::ProcessStatus
Expand All @@ -174,7 +207,10 @@ type Cmd
error("Cmd: too few words to exec")
end
this = new(exec,
"",
Dict{FileDes,PipeEnd}(),
Dict{FileDes,FileSink}(),
FileDes[],
Set{Cmd}(),
0,
ProcessNotRun(),
Expand All @@ -194,7 +230,9 @@ setsuccess(cmd::Cmd, f::Function) = (cmd.successful=f; cmd)
ignorestatus(cmd::Cmd) = setsuccess(cmd, ignore_success)

function show(io, cmd::Cmd)
if isa(cmd.exec,Vector{ByteString})
if cmd.name != ""
show(io, cmd.name)
elseif isa(cmd.exec,Vector{ByteString})
esc = shell_escape(cmd.exec...)
print(io, '`')
for c in esc
Expand All @@ -205,30 +243,41 @@ function show(io, cmd::Cmd)
end
print(io, '`')
else
invoke(show, (Any,), cmd.exec)
invoke(show, (Any, Any,), io, cmd.exec)
end
end

exec(cmd::Cmd) = exec(cmd.exec)

function close_sinks(cmd::Cmd)
for (f,s) in cmd.sinks
close_sink(s)
end
end

## Port: a file descriptor on a particular command ##

type Port
cmd::Cmd
fd::FileDes
end

fd(cmd::Cmd, f::FileDes) = Port(cmd,f)
function fd(cmd::Cmd, f::FileDes)
if !has(cmd.pipes, f) && !has(cmd.sinks, f) && !contains(cmd.closed_fds, f)
return Port(cmd,f)
end
error("no ", f, " available in ", cmd)
end

function fd(cmds::Set{Cmd}, f::FileDes)
set = Set{Port}()
for cmd in cmds
if !has(cmd.pipes, f)
if !has(cmd.pipes, f) && !has(cmd.sinks, f) && !contains(cmd.closed_fds, f)
add(set, fd(cmd,f))
end
end
if isempty(set)
error("no ", f, " available: ", cmds)
error("no ", f, " available in ", cmds)
end
set
end
Expand Down Expand Up @@ -277,11 +326,17 @@ end
output(cmds::Cmds) = stdout(cmds) & stderr(cmds)

function connect(port::Port, pend::PipeEnd)
if !has(port.cmd.pipes, port.fd)
if contains(port.cmd.closed_fds, port.fd)
error(port.cmd, " port ", port.fd, " is closed")
end
if !has(port.cmd.pipes, port.fd) && !has(port.cmd.sinks, port.fd)
port.cmd.pipes[port.fd] = pend
elseif port.cmd.pipes[port.fd] != pend
elseif has(port.cmd.pipes, port.fd) && port.cmd.pipes[port.fd] != pend
error(port.cmd, " is already connected to ",
fd(port.cmd.pipes[port.fd]))
elseif has(port.cmd.sinks, port.fd)
error(port.cmd, " is already connected to ",
fd(port.cmd.sinks[port.fd]))
end
return pend
end
Expand Down Expand Up @@ -339,6 +394,102 @@ end
(|)(src::Ports, dst::Cmds) = (src | stdin(dst); dst)
(|)(src::Cmds, dst::Cmds) = (stdout(src) | stdin(dst); src & dst)

redir(port::Port, sink::FileSink) = port.cmd.sinks[port.fd] = sink
function redir(ports::Ports, sink::FileSink)
for port in ports
redir(port, sink)
end
end

# redirect stdout
function (>)(src::String, dst::Cmds)
redir(stdin(dst), FileSink(src, "r"))
return dst
end

(<)(dst::Cmds, src::String) = (>)(src, dst)

function (>)(src::IOStream, dst::Cmds)
redir(stdin(dst), FileSink(src))
return dst
end

(<)(dst::Cmds, src::IOStream) = (>)(src, dst)

function (>)(src::Cmds, dst::String)
redir(stdout(src), FileSink(dst, "w"))
return src
end

function (>>)(src::Cmds, dst::String)
redir(stdout(src), FileSink(dst, "a"))
return src
end

(<)(dst::String, src::Cmds) = (>)(src, dst)
(<<)(dst::String, src::Cmds) = (>>)(src, dst)

function (>)(src::Cmds, dst::IOStream)
redir(stdout(src), FileSink(dst))
return src
end

(<)(dst::IOStream, src::Cmds) = (>)(src, dst)

# redirect stderr
function (.>)(src::Cmds, dst::String)
redir(stderr(src), FileSink(dst, "w"))
return src
end

function (.>>)(src::Cmds, dst::String)
redir(stderr(src), FileSink(dst, "a"))
return src
end

(.<)(dst::String, src::Cmds) = (.>)(src, dst)
(.<<)(dst::String, src::Cmds) = (.>>)(src, dst)

function (.>)(src::Cmds, dst::IOStream)
redir(stderr(src), FileSink(dst))
return src
end

(.<)(dst::IOStream, src::Cmds) = (.>)(src, dst)

# redirect both stdout and stderr
function (&>)(src::Cmds, dst::String)
redir(output(src), FileSink(dst, "w"))
return src
end

function (&>>)(src::Cmds, dst::String)
redir(output(src), FileSink(dst, "a"))
return src
end

(&<)(dst::String, src::Cmds) = (&>)(src, dst)
(&<<)(dst::String, src::Cmds) = (&>>)(src, dst)

function (&>)(src::Cmds, dst::IOStream)
redir(output(src), FileSink(dst))
return src
end

(&<)(dst::IOStream, src::Cmds) = (&>)(src, dst)

# here-strings:
function (>>>)(src::String, dst::Cmds)
hscmd = Cmd(()->print(src))
push(hscmd.closed_fds, STDIN)
push(hscmd.closed_fds, STDERR)
hscmd.name = "here-string<" * src * ">"
return hscmd | dst
end

(<<<)(dst::Cmds, src::String) = (>>>)(src, dst)


# spawn(cmd) starts all processes connected to cmd

function spawn(cmd::Cmd)
Expand All @@ -364,18 +515,34 @@ function spawn(cmd::Cmd)
c.status = ProcessRunning()
ptrs = isa(c.exec,Vector{ByteString}) ? _jl_pre_exec(c.exec) : nothing
dup2_fds = Array(Int32, 2*numel(c.pipes))
dup2_sinks = Array(Int32, 2*numel(c.sinks))
close_fds_ = copy(fds)
i = 0
for (f,p) in c.pipes
dup2_fds[i+=1] = fd(p).fd
dup2_fds[i+=1] = f.fd
del(close_fds_, fd(p))
end
i = 0
for (f,s) in c.sinks
dup2_sinks[i+=1] = fd(s)
dup2_sinks[i+=1] = f.fd
end
close_fds = Array(Int32, numel(close_fds_))
i = 0
for f in close_fds_
close_fds[i+=1] = f.fd
end

# save the stderr descriptor because it may be redirected, but we may need to
# print errors from Julia
bk_stderr_fd = ccall(:dup, Int32, (Int32,), STDERR.fd)
if bk_stderr_fd == -1
println(stderr_stream, "dup: ", strerror())
exit(0x7f)
end
bk_stderr_stream = fdio(bk_stderr_fd)

# now actually do the fork and exec without writes
pid = fork()
if pid == 0
Expand All @@ -385,7 +552,18 @@ function spawn(cmd::Cmd)
# dup2 manually inlined to avoid potential heap stomping
r = ccall(:dup2, Int32, (Int32, Int32), dup2_fds[i], dup2_fds[i+1])
if r == -1
println(stderr_stream, "dup2: ", strerror())
println(bk_stderr_stream, "dup2: ", strerror())
exit(0x7f)
end
i += 2
end
i = 1
n = length(dup2_sinks)
while i <= n
# dup2 manually inlined to avoid potential heap stomping
r = ccall(:dup2, Int32, (Int32, Int32), dup2_sinks[i], dup2_sinks[i+1])
if r == -1
println(bk_stderr_stream, "dup2: ", strerror())
exit(0x7f)
end
i += 2
Expand All @@ -396,14 +574,14 @@ function spawn(cmd::Cmd)
# close manually inlined to avoid potential heap stomping
r = ccall(:close, Int32, (Int32,), close_fds[i])
if r != 0
println(stderr_stream, "close: ", strerror())
println(bk_stderr_stream, "close: ", strerror())
exit(0x7f)
end
i += 1
end
if !isequal(ptrs, nothing)
ccall(:execvp, Int32, (Ptr{Uint8}, Ptr{Ptr{Uint8}}), ptrs[1], ptrs)
println(stderr_stream, "exec: ", strerror())
println(bk_stderr_stream, "exec: ", strerror())
exit(0x7f)
end
# other ways of execing (e.g. a julia function)
Expand All @@ -412,12 +590,13 @@ function spawn(cmd::Cmd)
try
exec(c)
catch err
show(stderr, err)
show(bk_stderr_stream, err)
exit(0x7f)
end
error("exec should not return but has")
end
c.pid = pid
close(bk_stderr_stream) # do it manually since gc is disabled
end
for f in fds_
close(f)
Expand All @@ -442,7 +621,7 @@ successful(cmd::Cmd) =
isa(cmd.status,ProcessRunning) || cmd.successful(cmd.status)

wait(cmd::Cmd, nohang::Bool) =
(cmd.status = process_status(wait(cmd.pid,nohang)); successful(cmd))
(cmd.status = process_status(wait(cmd.pid,nohang)); close_sinks(cmd); successful(cmd))

# wait for a set of command processes to finish

Expand Down
4 changes: 2 additions & 2 deletions src/julia-parser.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
; the way the lexer works, every prefix of an operator must also
; be an operator.
(<- -- -->)
(> < >= <= == === != |.>| |.<| |.>=| |.<=| |.==| |.!=| |.=| |.!| |<:| |>:|)
(> < >= <= == === != |.>| |.<| |.>=| |.<=| |.==| |.!=| |.=| |.!| |<:| |>:| |&>| |&<|)
(: |..|)
(+ - |.+| |.-| |\|| $)
(<< >> >>>)
(<< >> <<< >>> |.<<| |.>>| |&>>| |&<<|)
(* / |./| % & |.*| |\\| |.\\|)
(// .//)
(^ |.^|)
Expand Down