wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-25 14:22:37 +03:00
Code Issues Projects Releases Wiki Activity

fix compile for child waiter on !linux

Browse Source
This commit is contained in:
Wez Furlong 2018-02-20 21:32:44 -08:00
parent e9e3e47b94
commit 9dadffcf1e
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/sigchld.rs
View File

@ -26,9 +26,14 @@ impl Drop for ChildWaiter {
}
#[cfg(not(target_os = "linux"))]
extern "C" fn chld_handler(_signo: libc::c_int, _: *const u8, _: *const u8) {
extern "C" fn chld_handler(_signo: libc::c_int, si: *const libc::siginfo_t, _: *const u8) {
unsafe {
libc::write(WRITE_END, "x".as_ptr() as *const _, 1);
let pid = (*si).si_pid;
libc::write(
WRITE_END,
&pid as *const _ as *const libc::c_void,
mem::size_of::<libc::pid_t>(),
);
}
}
@ -46,7 +51,7 @@ impl ChildWaiter {
let mut sa: libc::sigaction = mem::zeroed();
sa.sa_sigaction = chld_handler as usize;
sa.sa_flags = (libc::SA_RESTART | libc::SA_NOCLDSTOP) as _;
sa.sa_flags = (libc::SA_SIGINFO | libc::SA_RESTART | libc::SA_NOCLDSTOP) as _;
let res = libc::sigaction(libc::SIGCHLD, &sa, ptr::null_mut());
if res == -1 {
bail!("sigaction SIGCHLD failed: {:?}", io::Error::last_os_error());
@ -78,6 +83,24 @@ impl ChildWaiter {
}
}
#[cfg(not(target_os = "linux"))]
pub fn read_one(&self) -> Result<u32, Error> {
let mut pid: libc::pid_t = 0;
let res = unsafe {
libc::read(
self.fd,
&mut pid as *mut _ as *mut libc::c_void,
mem::size_of::<libc::pid_t>(),
)
};
if res == mem::size_of::<libc::pid_t>() as isize {
Ok(pid as u32)
} else {
bail!("signalfd read failed: {:?}", io::Error::last_os_error());
}
}
#[cfg(target_os = "linux")]
pub fn read_one(&self) -> Result<u32, Error> {
const BUFSIZE: usize = mem::size_of::<libc::signalfd_siginfo>();
let mut buf = [0u8; BUFSIZE];