Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(endpoint): use array::from_fn instead of unsafe MaybeUninit #1806

Merged
merged 3 commits into from
Apr 4, 2024
Merged

refactor(endpoint): use array::from_fn instead of unsafe MaybeUninit #1806

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e34c942
refactor(endpoint): use array:from_fn instead of unsafe MaybeUninit
mxinden Apr 4, 2024
1c5281f
Address unrelated clippy lint
mxinden Apr 4, 2024
44a58ae
Add comment
mxinden Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions quinn/src/endpoint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use std::{
future::Future,
io,
io::IoSliceMut,
mem::MaybeUninit,
net::{SocketAddr, SocketAddrV6},
pin::Pin,
str,
Expand Down Expand Up @@ -432,20 +431,20 @@ pub(crate) struct Shared {
}

impl State {
fn drive_recv<'a>(&'a mut self, cx: &mut Context, now: Instant) -> Result<bool, io::Error> {
fn drive_recv(&mut self, cx: &mut Context, now: Instant) -> Result<bool, io::Error> {
self.recv_limiter.start_cycle();
let mut metas = [RecvMeta::default(); BATCH_SIZE];
let mut iovs = MaybeUninit::<[IoSliceMut<'a>; BATCH_SIZE]>::uninit();
self.recv_buf
.chunks_mut(self.recv_buf.len() / BATCH_SIZE)
.enumerate()
.for_each(|(i, buf)| unsafe {
iovs.as_mut_ptr()
.cast::<IoSliceMut>()
.add(i)
.write(IoSliceMut::<'a>::new(buf));
});
let mut iovs = unsafe { iovs.assume_init() };
let mut iovs: [IoSliceMut; BATCH_SIZE] = {
let mut bufs = self
.recv_buf
.chunks_mut(self.recv_buf.len() / BATCH_SIZE)
.map(IoSliceMut::new);

// expect() safe as self.recv_buf is chunked into BATCH_SIZE items
// and iovs will be of size BATCH_SIZE, thus from_fn is called
// exactly BATCH_SIZE times.
std::array::from_fn(|_| bufs.next().expect("BATCH_SIZE elements"))
Ralith marked this conversation as resolved.
Show resolved Hide resolved
};
loop {
match self.socket.poll_recv(cx, &mut iovs, &mut metas) {
Poll::Ready(Ok(msgs)) => {
Expand Down