Skip to content

Command: Support posix_spawn() on FreeBSD/OSX/GNU Linux #48624

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

Merged
merged 19 commits into from
Mar 23, 2018
Merged

Command: Support posix_spawn() on FreeBSD/OSX/GNU Linux #48624

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
518b3f7
Update libc to bring in posix_spawn bindings for FreeBSD.
bdrewery Feb 28, 2018
11696ac
Support posix_spawn() when possible.
alexcrichton Jan 26, 2018
f463386
Avoid error for unused variables
bdrewery Feb 27, 2018
94630e4
No need to zero when an initializer for the object is already used.
bdrewery Feb 27, 2018
8e3fa0d
Pass proper pointer for envp.
bdrewery Feb 27, 2018
b3ecf5f
Remove excess newline
bdrewery Feb 27, 2018
85b82f2
Support posix_spawn() for FreeBSD.
bdrewery Feb 27, 2018
e6efd0d
Add a specific test for spawn() returning ENOENT
bdrewery Mar 1, 2018
a9ea876
posix_spawn() always returns its error rather than setting errno.
bdrewery Mar 1, 2018
2e2d926
posix_spawn() on OSX supports returning ENOENT.
bdrewery Mar 1, 2018
ef73b3a
Add comment explaining when posix_spawn() can be supported.
bdrewery Mar 1, 2018
99b50ef
Use _
bdrewery Mar 2, 2018
5ba6b3a
Move glibc version lookup handling to sys::os and add a simpler glibc…
bdrewery Mar 2, 2018
d740083
Support posix_spawn() for Linux glibc 2.24+.
bdrewery Mar 2, 2018
57c74c3
Update beta to version with fixed FreeBSD support from #49023.
bdrewery Mar 19, 2018
00dac20
Merge branch 'update-beta-freebsd' into freebsd-posix-spawn
bdrewery Mar 19, 2018
6212904
Don't use posix_spawn() if PATH was modified in the environment.
bdrewery Mar 19, 2018
8e0faf7
Simplify PATH key comparison
bdrewery Mar 19, 2018
70559c5
Command::env_saw_path() may be unused on platforms not using posix_sp…
bdrewery Mar 22, 2018
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
2 changes: 1 addition & 1 deletion src/liblibc
Open in desktop
Submodule liblibc updated 19 files
+67 −35 Cargo.lock
+1 −1 Cargo.toml
+1 −0 appveyor.yml
+1 −0 ci/run.sh
+8 −2 libc-test/Cargo.toml
+17 −5 libc-test/build.rs
+7 −3 src/fuchsia/mod.rs
+3 −0 src/lib.rs
+119 −0 src/unix/bsd/apple/mod.rs
+76 −0 src/unix/bsd/freebsdlike/freebsd/mod.rs
+3 −0 src/unix/bsd/mod.rs
+15 −0 src/unix/bsd/netbsdlike/mod.rs
+7 −3 src/unix/mod.rs
+464 −0 src/unix/notbsd/android/mod.rs
+239 −0 src/unix/notbsd/linux/mips/mod.rs
+230 −8 src/unix/notbsd/linux/mod.rs
+1 −1 src/unix/notbsd/linux/other/b64/sparc64.rs
+276 −6 src/unix/notbsd/linux/other/mod.rs
+5 −3 src/unix/notbsd/mod.rs
102 changes: 102 additions & 0 deletions src/libstd/sys/unix/process/process_unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ impl Command {
-> io::Result<(Process, StdioPipes)> {
use sys;


const CLOEXEC_MSG_FOOTER: &'static [u8] = b"NOEX";

let envp = self.capture_env();
Expand All @@ -34,6 +35,11 @@ impl Command {
}

let (ours, theirs) = self.setup_io(default, needs_stdin)?;

if let Some(ret) = self.posix_spawn(&theirs, envp.as_ref())? {
return Ok((ret, ours))
}

let (input, output) = sys::pipe::anon_pipe()?;

let pid = unsafe {
Expand Down Expand Up @@ -229,6 +235,102 @@ impl Command {
libc::execvp(self.get_argv()[0], self.get_argv().as_ptr());
io::Error::last_os_error()
}

#[cfg(not(any(target_os = "linux", target_os = "macos")))]
fn posix_spawn(&mut self, _stdio: &ChildPipes, _envp: Option<&CStringArray>)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you change this to _?

Note that there is a subtle difference between using only _ and using a name that starts with an underscore. Something like _x still binds the value to the variable, whereas _ doesn’t bind at all.

(https://doc.rust-lang.org/book/second-edition/ch18-03-pattern-syntax.html)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, fixed.

-> io::Result<Option<Process>>
{
Ok(None)
}

#[cfg(any(target_os = "linux", target_os = "macos"))]
fn posix_spawn(&mut self, stdio: &ChildPipes, envp: Option<&CStringArray>)
-> io::Result<Option<Process>>
{
use mem;
use sys;

if self.get_cwd().is_some() ||
self.get_gid().is_some() ||
self.get_uid().is_some() ||
self.get_closures().len() != 0 {
return Ok(None)
}

let mut p = Process { pid: 0, status: None };

struct PosixSpawnFileActions(libc::posix_spawn_file_actions_t);

impl Drop for PosixSpawnFileActions {
fn drop(&mut self) {
unsafe {
libc::posix_spawn_file_actions_destroy(&mut self.0);
}
}
}

struct PosixSpawnattr(libc::posix_spawnattr_t);

impl Drop for PosixSpawnattr {
fn drop(&mut self) {
unsafe {
libc::posix_spawnattr_destroy(&mut self.0);
}
}
}

unsafe {
let mut file_actions = PosixSpawnFileActions(mem::zeroed());
let mut attrs = PosixSpawnattr(mem::zeroed());

libc::posix_spawnattr_init(&mut attrs.0);
libc::posix_spawn_file_actions_init(&mut file_actions.0);

if let Some(fd) = stdio.stdin.fd() {
cvt(libc::posix_spawn_file_actions_adddup2(&mut file_actions.0,
fd,
libc::STDIN_FILENO))?;
}
if let Some(fd) = stdio.stdout.fd() {
cvt(libc::posix_spawn_file_actions_adddup2(&mut file_actions.0,
fd,
libc::STDOUT_FILENO))?;
}
if let Some(fd) = stdio.stderr.fd() {
cvt(libc::posix_spawn_file_actions_adddup2(&mut file_actions.0,
fd,
libc::STDERR_FILENO))?;
}

let mut set: libc::sigset_t = mem::zeroed();
cvt(libc::sigemptyset(&mut set))?;
cvt(libc::posix_spawnattr_setsigmask(&mut attrs.0,
&set))?;
cvt(libc::sigaddset(&mut set, libc::SIGPIPE))?;
cvt(libc::posix_spawnattr_setsigdefault(&mut attrs.0,
&set))?;

let flags = libc::POSIX_SPAWN_SETSIGDEF |
libc::POSIX_SPAWN_SETSIGMASK;
cvt(libc::posix_spawnattr_setflags(&mut attrs.0, flags as _))?;

let envp = envp.map(|c| c.as_ptr())
.unwrap_or(sys::os::environ() as *const _);
let ret = libc::posix_spawnp(
&mut p.pid,
self.get_argv()[0],
&file_actions.0,
&attrs.0,
self.get_argv().as_ptr() as *const _,
envp as *const _,
);
if ret == 0 {
Ok(Some(p))
} else {
Err(io::Error::last_os_error())
}
}
}
}

////////////////////////////////////////////////////////////////////////////////
Expand Down