Skip to content

Fix setting O_NONBLOCK in parallel::stderr::set_non_blocking #946

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 5 commits into from
Feb 16, 2024
Merged

Fix setting O_NONBLOCK in parallel::stderr::set_non_blocking #946

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aff20bf
Update stderr.rFix setting O_NONBLOCK in parallel::stderr::set_non_bl…
NobodyXu Feb 13, 2024
cc13a4e
Fix nonblocking setting in `parallel::job_token`
NobodyXu Feb 14, 2024
7b44af5
Fix compilation in `parallel::jobslot::unix`
NobodyXu Feb 14, 2024
3d56928
Make `StderrForwarder::set_non_blocking` unix-only
NobodyXu Feb 14, 2024
8e5d0bb
Fix compilation: `StderrForwarder::set_non_blocking` should always be…
NobodyXu Feb 14, 2024
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
17 changes: 11 additions & 6 deletions src/parallel/stderr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@ pub fn set_non_blocking(stderr: &mut ChildStderr) -> Result<(), Error> {
{
use std::os::unix::io::AsRawFd;
let fd = stderr.as_raw_fd();
debug_assert_eq!(
unsafe { libc::fcntl(fd, libc::F_GETFL, 0) },
0,
"stderr should have no flags set"
);
let flags = unsafe { libc::fcntl(fd, libc::F_GETFL, 0) };
if flags == -1 {
return Err(Error::new(
ErrorKind::IOError,
format!(
"Failed to get flags for child stderr: {}",
std::io::Error::last_os_error()
),
));
}

if unsafe { libc::fcntl(fd, libc::F_SETFL, libc::O_NONBLOCK) } != 0 {
if unsafe { libc::fcntl(fd, libc::F_SETFL, flags | libc::O_NONBLOCK) } == -1 {
return Err(Error::new(
ErrorKind::IOError,
format!(
Expand Down