mirror of
https://github.com/rust-lang/rust.git
synced 2025-04-29 19:47:38 +00:00

Closes #73125 This is in pursuance of Issue #73127 Consider adding #[must_use] to std::process::ExitStatus In MR #81452 Add #[must_use] to [...] process::ExitStatus we concluded that the existing arrangements in are too awkward so adding that #[must_use] is blocked on improving the ergonomics. I wrote a mini-RFC-style discusion of the approach in https://github.com/rust-lang/rust/issues/73125#issuecomment-771092741 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
329 lines
11 KiB
Rust
329 lines
11 KiB
Rust
use crate::convert::{TryFrom, TryInto};
|
|
use crate::fmt;
|
|
use crate::io;
|
|
use crate::mem;
|
|
use crate::num::{NonZeroI32, NonZeroI64};
|
|
use crate::ptr;
|
|
|
|
use crate::sys::process::process_common::*;
|
|
use crate::sys::process::zircon::{zx_handle_t, Handle};
|
|
|
|
use libc::{c_int, size_t};
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// Command
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
impl Command {
|
|
pub fn spawn(
|
|
&mut self,
|
|
default: Stdio,
|
|
needs_stdin: bool,
|
|
) -> io::Result<(Process, StdioPipes)> {
|
|
let envp = self.capture_env();
|
|
|
|
if self.saw_nul() {
|
|
return Err(io::Error::new_const(
|
|
io::ErrorKind::InvalidInput,
|
|
&"nul byte found in provided data",
|
|
));
|
|
}
|
|
|
|
let (ours, theirs) = self.setup_io(default, needs_stdin)?;
|
|
|
|
let process_handle = unsafe { self.do_exec(theirs, envp.as_ref())? };
|
|
|
|
Ok((Process { handle: Handle::new(process_handle) }, ours))
|
|
}
|
|
|
|
pub fn exec(&mut self, default: Stdio) -> io::Error {
|
|
if self.saw_nul() {
|
|
return io::Error::new_const(
|
|
io::ErrorKind::InvalidInput,
|
|
&"nul byte found in provided data",
|
|
);
|
|
}
|
|
|
|
match self.setup_io(default, true) {
|
|
Ok((_, _)) => {
|
|
// FIXME: This is tough because we don't support the exec syscalls
|
|
unimplemented!();
|
|
}
|
|
Err(e) => e,
|
|
}
|
|
}
|
|
|
|
unsafe fn do_exec(
|
|
&mut self,
|
|
stdio: ChildPipes,
|
|
maybe_envp: Option<&CStringArray>,
|
|
) -> io::Result<zx_handle_t> {
|
|
use crate::sys::process::zircon::*;
|
|
|
|
let envp = match maybe_envp {
|
|
// None means to clone the current environment, which is done in the
|
|
// flags below.
|
|
None => ptr::null(),
|
|
Some(envp) => envp.as_ptr(),
|
|
};
|
|
|
|
let make_action = |local_io: &ChildStdio, target_fd| -> io::Result<fdio_spawn_action_t> {
|
|
if let Some(local_fd) = local_io.fd() {
|
|
Ok(fdio_spawn_action_t {
|
|
action: FDIO_SPAWN_ACTION_TRANSFER_FD,
|
|
local_fd,
|
|
target_fd,
|
|
..Default::default()
|
|
})
|
|
} else {
|
|
if let ChildStdio::Null = local_io {
|
|
// acts as no-op
|
|
return Ok(Default::default());
|
|
}
|
|
|
|
let mut handle = ZX_HANDLE_INVALID;
|
|
let status = fdio_fd_clone(target_fd, &mut handle);
|
|
if status == ERR_INVALID_ARGS || status == ERR_NOT_SUPPORTED {
|
|
// This descriptor is closed; skip it rather than generating an
|
|
// error.
|
|
return Ok(Default::default());
|
|
}
|
|
zx_cvt(status)?;
|
|
|
|
let mut cloned_fd = 0;
|
|
zx_cvt(fdio_fd_create(handle, &mut cloned_fd))?;
|
|
|
|
Ok(fdio_spawn_action_t {
|
|
action: FDIO_SPAWN_ACTION_TRANSFER_FD,
|
|
local_fd: cloned_fd as i32,
|
|
target_fd,
|
|
..Default::default()
|
|
})
|
|
}
|
|
};
|
|
|
|
// Clone stdin, stdout, and stderr
|
|
let action1 = make_action(&stdio.stdin, 0)?;
|
|
let action2 = make_action(&stdio.stdout, 1)?;
|
|
let action3 = make_action(&stdio.stderr, 2)?;
|
|
let actions = [action1, action2, action3];
|
|
|
|
// We don't want FileDesc::drop to be called on any stdio. fdio_spawn_etc
|
|
// always consumes transferred file descriptors.
|
|
mem::forget(stdio);
|
|
|
|
for callback in self.get_closures().iter_mut() {
|
|
callback()?;
|
|
}
|
|
|
|
let mut process_handle: zx_handle_t = 0;
|
|
zx_cvt(fdio_spawn_etc(
|
|
ZX_HANDLE_INVALID,
|
|
FDIO_SPAWN_CLONE_JOB
|
|
| FDIO_SPAWN_CLONE_LDSVC
|
|
| FDIO_SPAWN_CLONE_NAMESPACE
|
|
| FDIO_SPAWN_CLONE_ENVIRON // this is ignored when envp is non-null
|
|
| FDIO_SPAWN_CLONE_UTC_CLOCK,
|
|
self.get_program_cstr().as_ptr(),
|
|
self.get_argv().as_ptr(),
|
|
envp,
|
|
actions.len() as size_t,
|
|
actions.as_ptr(),
|
|
&mut process_handle,
|
|
ptr::null_mut(),
|
|
))?;
|
|
// FIXME: See if we want to do something with that err_msg
|
|
|
|
Ok(process_handle)
|
|
}
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// Processes
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
pub struct Process {
|
|
handle: Handle,
|
|
}
|
|
|
|
impl Process {
|
|
pub fn id(&self) -> u32 {
|
|
self.handle.raw() as u32
|
|
}
|
|
|
|
pub fn kill(&mut self) -> io::Result<()> {
|
|
use crate::sys::process::zircon::*;
|
|
|
|
unsafe {
|
|
zx_cvt(zx_task_kill(self.handle.raw()))?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
pub fn wait(&mut self) -> io::Result<ExitStatus> {
|
|
use crate::default::Default;
|
|
use crate::sys::process::zircon::*;
|
|
|
|
let mut proc_info: zx_info_process_t = Default::default();
|
|
let mut actual: size_t = 0;
|
|
let mut avail: size_t = 0;
|
|
|
|
unsafe {
|
|
zx_cvt(zx_object_wait_one(
|
|
self.handle.raw(),
|
|
ZX_TASK_TERMINATED,
|
|
ZX_TIME_INFINITE,
|
|
ptr::null_mut(),
|
|
))?;
|
|
zx_cvt(zx_object_get_info(
|
|
self.handle.raw(),
|
|
ZX_INFO_PROCESS,
|
|
&mut proc_info as *mut _ as *mut libc::c_void,
|
|
mem::size_of::<zx_info_process_t>(),
|
|
&mut actual,
|
|
&mut avail,
|
|
))?;
|
|
}
|
|
if actual != 1 {
|
|
return Err(io::Error::new_const(
|
|
io::ErrorKind::InvalidData,
|
|
&"Failed to get exit status of process",
|
|
));
|
|
}
|
|
Ok(ExitStatus(proc_info.return_code))
|
|
}
|
|
|
|
pub fn try_wait(&mut self) -> io::Result<Option<ExitStatus>> {
|
|
use crate::default::Default;
|
|
use crate::sys::process::zircon::*;
|
|
|
|
let mut proc_info: zx_info_process_t = Default::default();
|
|
let mut actual: size_t = 0;
|
|
let mut avail: size_t = 0;
|
|
|
|
unsafe {
|
|
let status =
|
|
zx_object_wait_one(self.handle.raw(), ZX_TASK_TERMINATED, 0, ptr::null_mut());
|
|
match status {
|
|
0 => {} // Success
|
|
x if x == ERR_TIMED_OUT => {
|
|
return Ok(None);
|
|
}
|
|
_ => {
|
|
panic!("Failed to wait on process handle: {}", status);
|
|
}
|
|
}
|
|
zx_cvt(zx_object_get_info(
|
|
self.handle.raw(),
|
|
ZX_INFO_PROCESS,
|
|
&mut proc_info as *mut _ as *mut libc::c_void,
|
|
mem::size_of::<zx_info_process_t>(),
|
|
&mut actual,
|
|
&mut avail,
|
|
))?;
|
|
}
|
|
if actual != 1 {
|
|
return Err(io::Error::new_const(
|
|
io::ErrorKind::InvalidData,
|
|
&"Failed to get exit status of process",
|
|
));
|
|
}
|
|
Ok(Some(ExitStatus(proc_info.return_code)))
|
|
}
|
|
}
|
|
|
|
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
|
|
pub struct ExitStatus(i64);
|
|
|
|
impl ExitStatus {
|
|
pub fn exit_ok(&self) -> Result<(), ExitStatusError> {
|
|
match NonZeroI64::try_from(self.0) {
|
|
/* was nonzero */ Ok(failure) => Err(ExitStatusError(failure)),
|
|
/* was zero, couldn't convert */ Err(_) => Ok(()),
|
|
}
|
|
}
|
|
|
|
pub fn code(&self) -> Option<i32> {
|
|
// FIXME: support extracting return code as an i64
|
|
self.0.try_into().ok()
|
|
}
|
|
|
|
pub fn signal(&self) -> Option<i32> {
|
|
None
|
|
}
|
|
|
|
// FIXME: The actually-Unix implementation in process_unix.rs uses WSTOPSIG, WCOREDUMP et al.
|
|
// I infer from the implementation of `success`, `code` and `signal` above that these are not
|
|
// available on Fuchsia.
|
|
//
|
|
// It does not appear that Fuchsia is Unix-like enough to implement ExitStatus (or indeed many
|
|
// other things from std::os::unix) properly. This veneer is always going to be a bodge. So
|
|
// while I don't know if these implementations are actually correct, I think they will do for
|
|
// now at least.
|
|
pub fn core_dumped(&self) -> bool {
|
|
false
|
|
}
|
|
pub fn stopped_signal(&self) -> Option<i32> {
|
|
None
|
|
}
|
|
pub fn continued(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
pub fn into_raw(&self) -> c_int {
|
|
// We don't know what someone who calls into_raw() will do with this value, but it should
|
|
// have the conventional Unix representation. Despite the fact that this is not
|
|
// standardised in SuS or POSIX, all Unix systems encode the signal and exit status the
|
|
// same way. (Ie the WIFEXITED, WEXITSTATUS etc. macros have identical behaviour on every
|
|
// Unix.)
|
|
//
|
|
// The caller of `std::os::unix::into_raw` is probably wanting a Unix exit status, and may
|
|
// do their own shifting and masking, or even pass the status to another computer running a
|
|
// different Unix variant.
|
|
//
|
|
// The other view would be to say that the caller on Fuchsia ought to know that `into_raw`
|
|
// will give a raw Fuchsia status (whatever that is - I don't know, personally). That is
|
|
// not possible here becaause we must return a c_int because that's what Unix (including
|
|
// SuS and POSIX) say a wait status is, but Fuchsia apparently uses a u64, so it won't
|
|
// necessarily fit.
|
|
//
|
|
// It seems to me that that the right answer would be to provide std::os::fuchsia with its
|
|
// own ExitStatusExt, rather that trying to provide a not very convincing imitation of
|
|
// Unix. Ie, std::os::unix::process:ExitStatusExt ought not to exist on Fuchsia. But
|
|
// fixing this up that is beyond the scope of my efforts now.
|
|
let exit_status_as_if_unix: u8 = self.0.try_into().expect("Fuchsia process return code bigger than 8 bits, but std::os::unix::ExitStatusExt::into_raw() was called to try to convert the value into a traditional Unix-style wait status, which cannot represent values greater than 255.");
|
|
let wait_status_as_if_unix = (exit_status_as_if_unix as c_int) << 8;
|
|
wait_status_as_if_unix
|
|
}
|
|
}
|
|
|
|
/// Converts a raw `c_int` to a type-safe `ExitStatus` by wrapping it without copying.
|
|
impl From<c_int> for ExitStatus {
|
|
fn from(a: c_int) -> ExitStatus {
|
|
ExitStatus(a as i64)
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for ExitStatus {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "exit code: {}", self.0)
|
|
}
|
|
}
|
|
|
|
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
|
|
pub struct ExitStatusError(NonZeroI64);
|
|
|
|
impl Into<ExitStatus> for ExitStatusError {
|
|
fn into(self) -> ExitStatus {
|
|
ExitStatus(self.0.into())
|
|
}
|
|
}
|
|
|
|
impl ExitStatusError {
|
|
pub fn code(self) -> Option<NonZeroI32> {
|
|
// fixme: affected by the same bug as ExitStatus::code()
|
|
ExitStatus(self.0.into()).code().map(|st| st.try_into().unwrap())
|
|
}
|
|
}
|