Deduplicate RefCell+Queue

embassy-nrf/src/time_driver.rs

@@ -281,26 +281,7 @@ pub(crate) fn init(irq_prio: crate::interrupt::Priority) {
 type RawQueue = embassy_executor::raw::timer_queue::TimerQueue;
 
 #[cfg(not(feature = "integrated-timers"))]
-struct RawQueue {
-    inner: core::cell::RefCell<embassy_time_queue_driver::queue_generic::Queue>,
-}
-
-#[cfg(not(feature = "integrated-timers"))]
-impl RawQueue {
-    const fn new() -> Self {
-        Self {
-            inner: core::cell::RefCell::new(embassy_time_queue_driver::queue_generic::Queue::new()),
-        }
-    }
-
-    fn schedule_wake(&self, waker: &core::task::Waker, at: u64) -> bool {
-        self.inner.borrow_mut().schedule_wake(at, waker)
-    }
-
-    fn next_expiration(&self, now: u64) -> u64 {
-        self.inner.borrow_mut().next_expiration(now)
-    }
-}
+type RawQueue = embassy_time_queue_driver::queue_generic::RefCellQueue;
 
 struct TimerQueueDriver {
     inner: Mutex<RawQueue>,

embassy-rp/src/time_driver.rs

@@ -129,26 +129,7 @@ fn TIMER0_IRQ_0() {
 type RawQueue = embassy_executor::raw::timer_queue::TimerQueue;
 
 #[cfg(not(feature = "integrated-timers"))]
-struct RawQueue {
-    inner: core::cell::RefCell<embassy_time_queue_driver::queue_generic::Queue>,
-}
-
-#[cfg(not(feature = "integrated-timers"))]
-impl RawQueue {
-    const fn new() -> Self {
-        Self {
-            inner: core::cell::RefCell::new(embassy_time_queue_driver::queue_generic::Queue::new()),
-        }
-    }
-
-    fn schedule_wake(&self, waker: &core::task::Waker, at: u64) -> bool {
-        self.inner.borrow_mut().schedule_wake(at, waker)
-    }
-
-    fn next_expiration(&self, now: u64) -> u64 {
-        self.inner.borrow_mut().next_expiration(now)
-    }
-}
+type RawQueue = embassy_time_queue_driver::queue_generic::RefCellQueue;
 
 struct TimerQueueDriver {
     inner: Mutex<CriticalSectionRawMutex, RawQueue>,

embassy-stm32/src/time_driver.rs

@@ -522,26 +522,7 @@ pub(crate) fn init(cs: CriticalSection) {
 type RawQueue = embassy_executor::raw::timer_queue::TimerQueue;
 
 #[cfg(not(feature = "integrated-timers"))]
-struct RawQueue {
-    inner: core::cell::RefCell<embassy_time_queue_driver::queue_generic::Queue>,
-}
-
-#[cfg(not(feature = "integrated-timers"))]
-impl RawQueue {
-    const fn new() -> Self {
-        Self {
-            inner: core::cell::RefCell::new(embassy_time_queue_driver::queue_generic::Queue::new()),
-        }
-    }
-
-    fn schedule_wake(&self, waker: &core::task::Waker, at: u64) -> bool {
-        self.inner.borrow_mut().schedule_wake(at, waker)
-    }
-
-    fn next_expiration(&self, now: u64) -> u64 {
-        self.inner.borrow_mut().next_expiration(now)
-    }
-}
+type RawQueue = embassy_time_queue_driver::queue_generic::RefCellQueue;
 
 struct TimerQueueDriver {
     inner: Mutex<CriticalSectionRawMutex, RawQueue>,

embassy-time-queue-driver/src/queue_generic.rs

@@ -1,10 +1,12 @@
 //! A generic timer queue. Time queue drivers may use this to simplify their implementation.
 
+use core::cell::RefCell;
 use core::cmp::{min, Ordering};
 use core::task::Waker;
 
 use heapless::Vec;
 pub use implem::Queue;
+pub use implem::RefCellQueue;
 
 #[derive(Debug)]
 struct Timer {
@@ -139,6 +141,30 @@ mod implem {
             self.queue.next_expiration(now)
         }
     }
+
+    /// A simple wrapper around a `Queue` to provide interior mutability.
+    pub struct RefCellQueue {
+        inner: RefCell<Queue>,
+    }
+
+    impl RefCellQueue {
+        /// Creates a new timer queue.
+        pub const fn new() -> Self {
+            Self {
+                inner: RefCell::new(Queue::new()),
+            }
+        }
+
+        /// Schedules a task to run at a specific time, and returns whether any changes were made.
+        pub fn schedule_wake(&self, waker: &core::task::Waker, at: u64) -> bool {
+            self.inner.borrow_mut().schedule_wake(at, waker)
+        }
+
+        /// Dequeues expired timers and returns the next alarm time.
+        pub fn next_expiration(&self, now: u64) -> u64 {
+            self.inner.borrow_mut().next_expiration(now)
+        }
+    }
 }
 
 #[cfg(feature = "generic-queue-const-generic")]
@@ -168,4 +194,28 @@ mod implem {
             self.queue.next_expiration(now)
         }
     }
+
+    /// A simple wrapper around a `Queue` to provide interior mutability.
+    pub struct RefCellQueue<const QUEUE_SIZE: usize> {
+        inner: RefCell<Queue<QUEUE_SIZE>>,
+    }
+
+    impl<const QUEUE_SIZE: usize> RefCellQueue<QUEUE_SIZE> {
+        /// Creates a new timer queue.
+        pub const fn new() -> Self {
+            Self {
+                inner: RefCell::new(Queue::new()),
+            }
+        }
+
+        /// Schedules a task to run at a specific time, and returns whether any changes were made.
+        pub fn schedule_wake(&self, waker: &core::task::Waker, at: u64) -> bool {
+            self.inner.borrow_mut().schedule_wake(at, waker)
+        }
+
+        /// Dequeues expired timers and returns the next alarm time.
+        pub fn next_expiration(&self, now: u64) -> u64 {
+            self.inner.borrow_mut().next_expiration(now)
+        }
+    }
 }

embassy-time/src/driver_std.rs

@@ -164,25 +164,7 @@ impl<T: Copy> UninitCell<T> {
     }
 }
 
-struct RawQueue {
-    inner: core::cell::RefCell<embassy_time_queue_driver::queue_generic::Queue>,
-}
-
-impl RawQueue {
-    const fn new() -> Self {
-        Self {
-            inner: core::cell::RefCell::new(embassy_time_queue_driver::queue_generic::Queue::new()),
-        }
-    }
-
-    fn schedule_wake(&self, waker: &core::task::Waker, at: u64) -> bool {
-        self.inner.borrow_mut().schedule_wake(at, waker)
-    }
-
-    fn next_expiration(&self, now: u64) -> u64 {
-        self.inner.borrow_mut().next_expiration(now)
-    }
-}
+type RawQueue = embassy_time_queue_driver::queue_generic::RefCellQueue;
 
 struct TimerQueueDriver {
     inner: Mutex<RawQueue>,

embassy-time/src/driver_wasm.rs

@@ -108,25 +108,7 @@ impl<T: Copy> UninitCell<T> {
     }
 }
 
-struct RawQueue {
-    inner: core::cell::RefCell<embassy_time_queue_driver::queue_generic::Queue>,
-}
-
-impl RawQueue {
-    const fn new() -> Self {
-        Self {
-            inner: core::cell::RefCell::new(embassy_time_queue_driver::queue_generic::Queue::new()),
-        }
-    }
-
-    fn schedule_wake(&self, waker: &core::task::Waker, at: u64) -> bool {
-        self.inner.borrow_mut().schedule_wake(at, waker)
-    }
-
-    fn next_expiration(&self, now: u64) -> u64 {
-        self.inner.borrow_mut().next_expiration(now)
-    }
-}
+type RawQueue = embassy_time_queue_driver::queue_generic::RefCellQueue;
 
 struct TimerQueueDriver {
     inner: Mutex<RawQueue>,