Skip to content

fix(idle-poll): wake the network task unconditionally #2444

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
cagatay-y wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −13
Open

fix(idle-poll): wake the network task unconditionally #2444

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
23 changes: 10 additions & 13 deletions src/executor/network.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,19 +246,16 @@ async fn network_run() {

let now = now();

match nic.poll_common(now) {
PollResult::SocketStateChanged => {
// Progress was made
cx.waker().wake_by_ref();
}
PollResult::None => {
// Very likely no progress can be made, so set up a timer interrupt to wake the waker
NETWORK_WAKER.lock().register(cx.waker());
nic.set_polling_mode(false);
if let Some(wakeup_time) = nic.poll_delay(now).map(|d| d.total_micros()) {
create_timer(Source::Network, wakeup_time);
trace!("Configured an interrupt for {wakeup_time:?}");
}
if nic.poll_common(now) == PollResult::SocketStateChanged || cfg!(feature = "idle-poll") {
// Progress was made or we want to poll when idle.
cx.waker().wake_by_ref();
} else {
// Very likely no progress can be made, so set up a timer interrupt to wake the waker
NETWORK_WAKER.lock().register(cx.waker());
nic.set_polling_mode(false);
if let Some(wakeup_time) = nic.poll_delay(now).map(|d| d.total_micros()) {
create_timer(Source::Network, wakeup_time);
trace!("Configured an interrupt for {wakeup_time:?}");
}
}

Expand Down
Loading