diff options
Diffstat (limited to 'crates/runner/src/jobserver.rs')
-rw-r--r-- | crates/runner/src/jobserver.rs | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/crates/runner/src/jobserver.rs b/crates/runner/src/jobserver.rs index a44ba6c..2422a75 100644 --- a/crates/runner/src/jobserver.rs +++ b/crates/runner/src/jobserver.rs @@ -1,5 +1,5 @@ use std::{ - os::{fd::BorrowedFd, unix::prelude::RawFd}, + os::fd::{AsRawFd, FromRawFd, OwnedFd}, slice, }; @@ -12,38 +12,37 @@ use super::util::unix; #[derive(Debug)] pub struct Jobserver { tokens: usize, - r: RawFd, - w: RawFd, + r: OwnedFd, + w: OwnedFd, } impl Jobserver { pub fn new(tokens: usize) -> Result<Jobserver> { - let (r, w) = unistd::pipe2(OFlag::O_CLOEXEC | OFlag::O_NONBLOCK).context("pipe()")?; + let (piper, pipew) = + unistd::pipe2(OFlag::O_CLOEXEC | OFlag::O_NONBLOCK).context("pipe()")?; + let r = unsafe { OwnedFd::from_raw_fd(piper) }; + let w = unsafe { OwnedFd::from_raw_fd(pipew) }; for _ in 0..tokens { - if unistd::write(w, b"+").is_err() { + if unistd::write(w.as_raw_fd(), b"+").is_err() { break; } } - unix::set_blocking(w, true)?; + unix::set_blocking(&w, true)?; Ok(Jobserver { tokens, r, w }) } - fn read_fd(&self) -> BorrowedFd<'_> { - unsafe { BorrowedFd::borrow_raw(self.r) } - } - pub fn wait(&mut self) -> u8 { loop { poll::poll( - &mut [poll::PollFd::new(&self.read_fd(), poll::PollFlags::POLLIN)], + &mut [poll::PollFd::new(&self.r, poll::PollFlags::POLLIN)], -1, ) .expect("poll()"); let mut token = 0; - match unistd::read(self.r, slice::from_mut(&mut token)) { + match unistd::read(self.r.as_raw_fd(), slice::from_mut(&mut token)) { Ok(n) => { assert!(n == 1); return token; @@ -60,25 +59,24 @@ impl Jobserver { } pub fn post(&mut self, token: u8) { - let n = unistd::write(self.w, slice::from_ref(&token)).expect("write()"); + let n = unistd::write(self.w.as_raw_fd(), slice::from_ref(&token)).expect("write()"); assert!(n == 1); } pub fn set_cloexec(&mut self, cloexec: bool) -> Result<()> { - unix::set_cloexec(self.r, cloexec)?; - unix::set_cloexec(self.w, cloexec)?; + unix::set_cloexec(&self.r, cloexec)?; + unix::set_cloexec(&self.w, cloexec)?; Ok(()) } pub fn to_makeflags(&self) -> String { - format!(" -j{} --jobserver-auth={},{}", self.tokens, self.r, self.w) + format!( + " -j{} --jobserver-auth={},{}", + self.tokens, + self.r.as_raw_fd(), + self.w.as_raw_fd(), + ) } } -impl Drop for Jobserver { - fn drop(&mut self) { - // FIXME Logging - let _ = unistd::close(self.r); - let _ = unistd::close(self.w); - } -} +// FIXME Log lost tokens on drop |