Skip to content

Move on_timeout handling to the main part of the work loop #2409

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

Open
antoniovicente wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −13
Open

Move on_timeout handling to the main part of the work loop #2409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 tokio-quiche/src/quic/io/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,16 @@ where
loop {
let now = Instant::now();

if let Some(deadline) = current_deadline {
if deadline <= now {
qconn.on_timeout();

self.write_state.next_release_time = None;
current_deadline = None;
sleep.as_mut().reset((now + DEFAULT_SLEEP).into());
}
}

self.write_state.has_pending_data = true;

while self.write_state.has_pending_data {
Expand Down Expand Up @@ -313,19 +323,8 @@ where

select! {
biased;
() = &mut sleep => {
// It's very important that we keep the timeout arm at the top of this loop so
// that we poll it every time we need to. Since this is a biased `select!`, if
// we put this behind another arm, we could theoretically starve the sleep arm
// and hang connections.
//
// See https://docs.rs/tokio/latest/tokio/macro.select.html#fairness for more
qconn.on_timeout();

self.write_state.next_release_time = None;
current_deadline = None;
sleep.as_mut().reset((now + DEFAULT_SLEEP).into());
}
// The sleep branch will be handled by the current_deadline and on_timeout check on the next iteration of the loop.
() = &mut sleep => (),
Some(pkt) = incoming_recv.recv() => ctx.in_pkt = Some(pkt),
directive = self.wait_for_data_or_handshake(qconn, application) => {
match directive? {
Expand Down
Loading