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

avoid unneeded programming of the timer interrupt #847

Merged
merged 1 commit into from
Aug 15, 2023
Merged

avoid unneeded programming of the timer interrupt #847

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
56 changes: 37 additions & 19 deletions src/executor/network.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,12 @@ pub(crate) fn block_on<F, T>(future: F, timeout: Option<Duration>) -> Result<T,
where
F: Future<Output = Result<T, i32>>,
{
// allow network interrupts
get_network_driver().unwrap().lock().set_polling_mode(true);
// disable network interrupts
let no_retransmission = {
let mut guard = get_network_driver().unwrap().lock();
guard.set_polling_mode(true);
!guard.get_checksums().tcp.tx()
};

let backoff = Backoff::new();
let start = now();
Expand All @@ -252,9 +256,11 @@ where
let now = crate::executor::network::now();

if let Poll::Ready(t) = future.as_mut().poll(&mut cx) {
let network_timer = network_delay(now)
.map(|d| crate::arch::processor::get_timer_ticks() + d.total_micros());
core_scheduler().add_network_timer(network_timer);
if !no_retransmission {
let network_timer = network_delay(now)
.map(|d| crate::arch::processor::get_timer_ticks() + d.total_micros());
core_scheduler().add_network_timer(network_timer);
}

// allow network interrupts
get_network_driver().unwrap().lock().set_polling_mode(false);
Expand All @@ -264,9 +270,11 @@ where

if let Some(duration) = timeout {
if crate::executor::network::now() >= start + duration {
let network_timer = network_delay(now)
.map(|d| crate::arch::processor::get_timer_ticks() + d.total_micros());
core_scheduler().add_network_timer(network_timer);
if !no_retransmission {
let network_timer = network_delay(now)
.map(|d| crate::arch::processor::get_timer_ticks() + d.total_micros());
core_scheduler().add_network_timer(network_timer);
}

// allow network interrupts
get_network_driver().unwrap().lock().set_polling_mode(false);
Expand All @@ -277,11 +285,13 @@ where

let delay = network_delay(now).map(|d| d.total_micros());
if backoff.is_completed() && delay.unwrap_or(10_000_000) > 10_000 {
let ticks = crate::arch::processor::get_timer_ticks();
let wakeup_time =
timeout.map(|duration| u64::try_from((start + duration).total_micros()).unwrap());
let network_timer = delay.map(|d| ticks + d);
core_scheduler().add_network_timer(network_timer);
if !no_retransmission {
let ticks = crate::arch::processor::get_timer_ticks();
let network_timer = delay.map(|d| ticks + d);
core_scheduler().add_network_timer(network_timer);
}

// allow network interrupts
get_network_driver().unwrap().lock().set_polling_mode(false);
Expand All @@ -303,8 +313,12 @@ pub(crate) fn poll_on<F, T>(future: F, timeout: Option<Duration>) -> Result<T, i
where
F: Future<Output = Result<T, i32>>,
{
// avoid network interrupts
get_network_driver().unwrap().lock().set_polling_mode(true);
// disable network interrupts
let no_retransmission = {
let mut guard = get_network_driver().unwrap().lock();
guard.set_polling_mode(true);
guard.get_checksums().tcp.tx()
};

let start = now();
let waker = core::task::Waker::noop();
Expand All @@ -317,9 +331,11 @@ where
crate::executor::run();

if let Poll::Ready(t) = future.as_mut().poll(&mut cx) {
let wakeup_time = network_delay(now())
.map(|d| crate::arch::processor::get_timer_ticks() + d.total_micros());
core_scheduler().add_network_timer(wakeup_time);
if !no_retransmission {
let wakeup_time = network_delay(now())
.map(|d| crate::arch::processor::get_timer_ticks() + d.total_micros());
core_scheduler().add_network_timer(wakeup_time);
}

// allow network interrupts
get_network_driver().unwrap().lock().set_polling_mode(false);
Expand All @@ -329,9 +345,11 @@ where

if let Some(duration) = timeout {
if crate::executor::network::now() >= start + duration {
let wakeup_time = network_delay(now())
.map(|d| crate::arch::processor::get_timer_ticks() + d.total_micros());
core_scheduler().add_network_timer(wakeup_time);
if !no_retransmission {
let wakeup_time = network_delay(now())
.map(|d| crate::arch::processor::get_timer_ticks() + d.total_micros());
core_scheduler().add_network_timer(wakeup_time);
}

// allow network interrupts
get_network_driver().unwrap().lock().set_polling_mode(false);
Expand Down