entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

runtime: replace epoll by io-uring

Browse source
This commit is contained in:
Julian Orth 2022-05-12 22:50:33 +02:00
parent 98cc85e2d3
commit 9416efeabe
21 changed files with 173 additions and 742 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/sighand.rs
View file

@ -1,7 +1,6 @@
use {
crate::{
async_engine::{AsyncEngine, SpawnedFuture},
event_loop::{EventLoop, EventLoopError},
io_uring::IoUring,
utils::{errorfmt::ErrorFmt, oserror::OsError},
},
@ -16,12 +15,9 @@ pub enum SighandError {
BlockFailed(#[source] OsError),
#[error("Could not create a signalfd")]
CreateFailed(#[source] OsError),
#[error("The event loop caused an error")]
EventLoopError(#[from] EventLoopError),
}
pub fn install(
el: &Rc<EventLoop>,
eng: &Rc<AsyncEngine>,
ring: &Rc<IoUring>,
) -> Result<SpawnedFuture<()>, SighandError> {
@ -36,10 +32,10 @@ pub fn install(
Ok(fd) => Rc::new(fd),
Err(e) => return Err(SighandError::CreateFailed(e.into())),
};
Ok(eng.spawn(handle_signals(fd, ring.clone(), el.clone())))
Ok(eng.spawn(handle_signals(fd, ring.clone())))
}
async fn handle_signals(fd: Rc<OwnedFd>, ring: Rc<IoUring>, el: Rc<EventLoop>) {
async fn handle_signals(fd: Rc<OwnedFd>, ring: Rc<IoUring>) {
let mut siginfo: c::signalfd_siginfo = uapi::pod_zeroed();
loop {
if let Err(e) = ring.readable(&fd).await {
@ -66,7 +62,7 @@ async fn handle_signals(fd: Rc<OwnedFd>, ring: Rc<IoUring>, el: Rc<EventLoop>) {
log::info!("Received signal {}", sig);
if matches!(sig, c::SIGINT | c::SIGTERM) {
log::info!("Exiting");
el.stop();
ring.stop();
}
}
}