mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-25 21:19:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary MaybeUninit

Browse source
This commit is contained in:
Emil Fresk 2023-01-25 15:24:32 +01:00 committed by Henrik Tjäder
parent bdf577c308
commit 2e96229c91
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
rtic-time/src/lib.rs
View file

@ -7,7 +7,6 @@
#![feature(async_fn_in_trait)] #![feature(async_fn_in_trait)]
use core::future::{poll_fn, Future}; use core::future::{poll_fn, Future};
use core::mem::MaybeUninit;
use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use core::task::{Poll, Waker}; use core::task::{Poll, Waker};
use futures_util::{ use futures_util::{
@ -23,9 +22,7 @@ use linked_list::{Link, LinkedList};
/// Holds a waker and at which time instant this waker shall be awoken. /// Holds a waker and at which time instant this waker shall be awoken.
struct WaitingWaker<Mono: Monotonic> { struct WaitingWaker<Mono: Monotonic> {
// This is alway initialized when used, we create this struct on the async stack and then waker: Waker,
// initialize the waker field in the `poll_fn` closure (we then know the waker)
waker: MaybeUninit<Waker>,
release_at: Mono::Instant, release_at: Mono::Instant,
was_poped: AtomicBool, was_poped: AtomicBool,
} }
@ -33,7 +30,7 @@ struct WaitingWaker<Mono: Monotonic> {
impl<Mono: Monotonic> Clone for WaitingWaker<Mono> { impl<Mono: Monotonic> Clone for WaitingWaker<Mono> {
fn clone(&self) -> Self { fn clone(&self) -> Self {
Self { Self {
waker: MaybeUninit::new(unsafe { self.waker.assume_init_ref() }.clone()), waker: self.waker.clone(),
release_at: self.release_at, release_at: self.release_at,
was_poped: AtomicBool::new(self.was_poped.load(Ordering::Relaxed)), was_poped: AtomicBool::new(self.was_poped.load(Ordering::Relaxed)),
} }
@ -121,7 +118,7 @@ impl<Mono: Monotonic> TimerQueue<Mono> {
match (head, release_at) { match (head, release_at) {
(Some(link), _) => { (Some(link), _) => {
link.waker.assume_init().wake(); link.waker.wake();
} }
(None, Some(instant)) => { (None, Some(instant)) => {
Mono::enable_timer(); Mono::enable_timer();
@ -188,13 +185,8 @@ impl<Mono: Monotonic> TimerQueue<Mono> {
); );
} }
let mut link = Link::new(WaitingWaker { let mut link = None;
waker: MaybeUninit::uninit(),
release_at: instant,
was_poped: AtomicBool::new(false),
});
let mut first_run = true;
let queue = &self.queue; let queue = &self.queue;
let marker = &AtomicUsize::new(0); let marker = &AtomicUsize::new(0);
@ -207,10 +199,14 @@ impl<Mono: Monotonic> TimerQueue<Mono> {
return Poll::Ready(()); return Poll::Ready(());
} }
if first_run { if link.is_none() {
first_run = false; let mut link_ref = link.insert(Link::new(WaitingWaker {
link.val.waker.write(cx.waker().clone()); waker: cx.waker().clone(),
let (was_empty, addr) = queue.insert(&mut link); release_at: instant,
was_poped: AtomicBool::new(false),
}));
let (was_empty, addr) = queue.insert(&mut link_ref);
marker.store(addr, Ordering::Relaxed); marker.store(addr, Ordering::Relaxed);
if was_empty { if was_empty {
@ -223,9 +219,11 @@ impl<Mono: Monotonic> TimerQueue<Mono> {
}) })
.await; .await;
if link.val.was_poped.load(Ordering::Relaxed) { if let Some(link) = link {
// If it was poped from the queue there is no need to run delete if link.val.was_poped.load(Ordering::Relaxed) {
dropper.defuse(); // If it was poped from the queue there is no need to run delete
dropper.defuse();
}
} else { } else {
// Make sure that our link is deleted from the list before we drop this stack // Make sure that our link is deleted from the list before we drop this stack
drop(dropper); drop(dropper);