GetLitFam/esp-hal
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Do not access current time on each schedule

Browse Source
This commit is contained in:
Dániel Buga 2024-12-01 15:05:03 +01:00
parent 790c5d5db3
commit 381db5a858
No known key found for this signature in database
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
esp-hal-embassy/src/timer_queue.rs
View File

@ -34,14 +34,17 @@ impl TimerQueue {
} }
pub fn dispatch(&self) { pub fn dispatch(&self) {
let now = esp_hal::time::now().ticks();
let next_expiration = self.inner.with(|q| adapter::dequeue(q, now));
self.arm_alarm(next_expiration);
}
fn arm_alarm(&self, mut next_expiration: u64) {
let alarm = self.alarm(); let alarm = self.alarm();
loop { while !alarm.update(next_expiration) {
let now = adapter::now(); // next_expiration is in the past, dequeue and find a new expiration
let next_expiration = self.inner.with(|q| adapter::dequeue(q, now)); next_expiration = self.inner.with(|q| adapter::dequeue(q, next_expiration));
if alarm.update(next_expiration) {
break;
}
} }
} }
} }
@ -69,20 +72,15 @@ mod adapter {
use embassy_executor::raw; use embassy_executor::raw;
pub(super) type RawQueue = raw::timer_queue::TimerQueue; pub(super) type RawQueue = raw::timer_queue::TimerQueue;
pub(super) type Instant = u64;
pub(super) fn now() -> Instant { pub(super) fn dequeue(q: &mut RawQueue, now: u64) -> u64 {
esp_hal::time::now().ticks()
}
pub(super) fn dequeue(q: &mut RawQueue, now: Instant) -> u64 {
unsafe { q.next_expiration(now, embassy_executor::raw::wake_task) } unsafe { q.next_expiration(now, embassy_executor::raw::wake_task) }
} }
impl super::TimerQueue { impl super::TimerQueue {
pub fn schedule_wake(&self, task: raw::TaskRef, at: u64) { pub fn schedule_wake(&self, task: raw::TaskRef, at: u64) {
if unsafe { self.inner.with(|q| q.schedule_wake(task, at)) } { if unsafe { self.inner.with(|q| q.schedule_wake(task, at)) } {
self.dispatch(); self.arm_alarm(at);
} }
} }
} }
@ -92,17 +90,14 @@ mod adapter {
mod adapter { mod adapter {
use core::task::Waker; use core::task::Waker;
use embassy_time::Instant;
pub(super) type RawQueue = embassy_time::queue_generic::Queue< pub(super) type RawQueue = embassy_time::queue_generic::Queue<
{ esp_config::esp_config_int!(usize, "ESP_HAL_EMBASSY_GENERIC_QUEUE_SIZE") }, { esp_config::esp_config_int!(usize, "ESP_HAL_EMBASSY_GENERIC_QUEUE_SIZE") },
>; >;
pub(super) type Instant = embassy_time::Instant;
pub(super) fn now() -> Instant { pub(super) fn dequeue(q: &mut RawQueue, now: u64) -> u64 {
Instant::now() q.next_expiration(Instant::from_ticks(now)).as_ticks()
}
pub(super) fn dequeue(q: &mut RawQueue, now: Instant) -> u64 {
q.next_expiration(now).as_ticks()
} }
impl super::TimerQueue { impl super::TimerQueue {
@ -111,7 +106,7 @@ mod adapter {
.inner .inner
.with(|q| q.schedule_wake(Instant::from_ticks(at), waker)) .with(|q| q.schedule_wake(Instant::from_ticks(at), waker))
{ {
self.dispatch(); self.arm_alarm(at);
} }
} }
} }