9812a02f87
There should no longer be any - read - write - connect - sendmsg - recvmsg - accept calls in the codebase. Previously we were using a mix of io_uring and these calls which had some negative effects: Since we were using the old system calls, we had to set the file descriptors to non-blocking. But our io_uring code did not handle EAGAIN. This lead to programs sometimes being killed when the wayland IO was actually blocking. Now all file descriptors are set to blocking, but io_uring makes it non-blocking from our perspective. The one exception are evdev files because they are read via libinput and libinput uses the old system calls.
52 lines
1.6 KiB
Rust
52 lines
1.6 KiB
Rust
use {
|
|
crate::{
|
|
async_engine::{AsyncEngine, SpawnedFuture},
|
|
io_uring::IoUring,
|
|
utils::{buf::TypedBuf, errorfmt::ErrorFmt, oserror::OsError},
|
|
},
|
|
std::rc::Rc,
|
|
thiserror::Error,
|
|
uapi::{c, OwnedFd},
|
|
};
|
|
|
|
#[derive(Debug, Error)]
|
|
pub enum SighandError {
|
|
#[error("Could not block the signalfd signals")]
|
|
BlockFailed(#[source] OsError),
|
|
#[error("Could not create a signalfd")]
|
|
CreateFailed(#[source] OsError),
|
|
}
|
|
|
|
pub fn install(
|
|
eng: &Rc<AsyncEngine>,
|
|
ring: &Rc<IoUring>,
|
|
) -> Result<SpawnedFuture<()>, SighandError> {
|
|
let mut set: c::sigset_t = uapi::pod_zeroed();
|
|
uapi::sigaddset(&mut set, c::SIGINT).unwrap();
|
|
uapi::sigaddset(&mut set, c::SIGTERM).unwrap();
|
|
uapi::sigaddset(&mut set, c::SIGPIPE).unwrap();
|
|
if let Err(e) = uapi::pthread_sigmask(c::SIG_BLOCK, Some(&set), None) {
|
|
return Err(SighandError::BlockFailed(e.into()));
|
|
}
|
|
let fd = match uapi::signalfd_new(&set, c::SFD_CLOEXEC) {
|
|
Ok(fd) => Rc::new(fd),
|
|
Err(e) => return Err(SighandError::CreateFailed(e.into())),
|
|
};
|
|
Ok(eng.spawn(handle_signals(fd, ring.clone())))
|
|
}
|
|
|
|
async fn handle_signals(fd: Rc<OwnedFd>, ring: Rc<IoUring>) {
|
|
let mut buf = TypedBuf::<c::signalfd_siginfo>::new();
|
|
loop {
|
|
if let Err(e) = ring.read(&fd, buf.buf()).await {
|
|
log::error!("Could not read from signal fd: {}", ErrorFmt(e));
|
|
return;
|
|
}
|
|
let sig = buf.t().ssi_signo as i32;
|
|
log::info!("Received signal {}", sig);
|
|
if matches!(sig, c::SIGINT | c::SIGTERM) {
|
|
log::info!("Exiting");
|
|
ring.stop();
|
|
}
|
|
}
|
|
}
|