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

io_uring: remove unnecessary interior mutability

Browse source
This commit is contained in:
Julian Orth 2022-05-17 15:10:45 +02:00
parent fe80440f38
commit 20b1f29343
4 changed files with 41 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/io_uring/ops/poll.rs
View file

@ -5,10 +5,7 @@ use {
sys::{io_uring_sqe, IORING_OP_POLL_ADD},
IoUring, IoUringData, IoUringError, Task, TaskResultExt,
},
std::{
cell::{Cell, RefCell},
rc::Rc,
},
std::rc::Rc,
uapi::{c, OwnedFd},
};
@ -18,12 +15,13 @@ impl IoUring {
let id = self.ring.id();
let pr = self.ring.pending_results.acquire();
{
let pw = self.ring.cached_polls.pop().unwrap_or_default();
pw.id.set(id.id);
*pw.data.borrow_mut() = Some(Data {
let mut pw = self.ring.cached_polls.pop().unwrap_or_default();
pw.id = id.id;
pw.fd = fd.raw() as _;
pw.events = events as _;
pw.data = Some(Data {
pr: pr.clone(),
fd: fd.clone(),
events: events as _,
_fd: fd.clone(),
});
self.ring.schedule(pw);
}
@ -41,34 +39,32 @@ impl IoUring {
struct Data {
pr: PendingResult,
fd: Rc<OwnedFd>,
events: u16,
_fd: Rc<OwnedFd>,
}
#[derive(Default)]
pub struct PollTask {
id: Cell<u64>,
data: RefCell<Option<Data>>,
id: u64,
events: u16,
fd: i32,
data: Option<Data>,
}
unsafe impl Task for PollTask {
fn id(&self) -> u64 {
self.id.get()
self.id
}
fn complete(self: Box<Self>, ring: &IoUringData, res: i32) {
let data = self.data.borrow_mut().take();
if let Some(data) = data {
fn complete(mut self: Box<Self>, ring: &IoUringData, res: i32) {
if let Some(data) = self.data.take() {
data.pr.complete(res);
}
ring.cached_polls.push(self);
}
fn encode(&self, sqe: &mut io_uring_sqe) {
let data = self.data.borrow_mut();
let data = data.as_ref().unwrap();
sqe.opcode = IORING_OP_POLL_ADD;
sqe.fd = data.fd.raw();
sqe.u3.poll_events = data.events;
sqe.fd = self.fd;
sqe.u3.poll_events = self.events;
}
}