From 0bb5814443f3b8e5c1d20c1ede7fed8265e653ec Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Wed, 5 Apr 2023 20:20:55 +0200 Subject: Fix monotonics race --- rtic-monotonics/src/nrf/rtc.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'rtic-monotonics/src/nrf/rtc.rs') diff --git a/rtic-monotonics/src/nrf/rtc.rs b/rtic-monotonics/src/nrf/rtc.rs index 03610c0..2e23389 100644 --- a/rtic-monotonics/src/nrf/rtc.rs +++ b/rtic-monotonics/src/nrf/rtc.rs @@ -189,13 +189,18 @@ macro_rules! make_rtc { // and the flag here. critical_section::with(|_| { let rtc = unsafe { &*$rtc::PTR }; - let cnt = rtc.counter.read().bits() as u64; + let cnt = rtc.counter.read().bits(); + // OVERFLOW HAPPENS HERE race needs to be handled let ovf = if Self::is_overflow() { $overflow.load(Ordering::Relaxed) + 1 } else { $overflow.load(Ordering::Relaxed) } as u64; + // Check and fix if above race happened + let new_cnt = rtc.counter.read().bits(); + let cnt = if new_cnt >= cnt { cnt } else { new_cnt } as u64; + Self::Instant::from_ticks((ovf << 24) | cnt) }) } -- cgit v1.2.3