max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace the pointer in TaskHeader with an Option<&Executor>

Browse Source
This commit is contained in:
Grant Miller 2023-01-31 17:49:18 -06:00
parent a697f1517a
commit fb1946be7f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
embassy-executor/src/raw/mod.rs
View File

@ -15,10 +15,10 @@ mod waker;
use core::cell::Cell; use core::cell::Cell;
use core::future::Future; use core::future::Future;
use core::mem;
use core::pin::Pin; use core::pin::Pin;
use core::ptr::NonNull; use core::ptr::NonNull;
use core::task::{Context, Poll}; use core::task::{Context, Poll};
use core::{mem, ptr};
use atomic_polyfill::{AtomicU32, Ordering}; use atomic_polyfill::{AtomicU32, Ordering};
use critical_section::CriticalSection; use critical_section::CriticalSection;
@ -46,7 +46,7 @@ pub(crate) const STATE_TIMER_QUEUED: u32 = 1 << 2;
pub(crate) struct TaskHeader { pub(crate) struct TaskHeader {
pub(crate) state: AtomicU32, pub(crate) state: AtomicU32,
pub(crate) run_queue_item: RunQueueItem, pub(crate) run_queue_item: RunQueueItem,
pub(crate) executor: Cell<*const Executor>, // Valid if state != 0 pub(crate) executor: Cell<Option<&'static Executor>>,
poll_fn: unsafe fn(TaskRef), poll_fn: unsafe fn(TaskRef),
#[cfg(feature = "integrated-timers")] #[cfg(feature = "integrated-timers")]
@ -115,7 +115,7 @@ impl<F: Future + 'static> TaskStorage<F> {
raw: TaskHeader { raw: TaskHeader {
state: AtomicU32::new(0), state: AtomicU32::new(0),
run_queue_item: RunQueueItem::new(), run_queue_item: RunQueueItem::new(),
executor: Cell::new(ptr::null()), executor: Cell::new(None),
poll_fn: Self::poll, poll_fn: Self::poll,
#[cfg(feature = "integrated-timers")] #[cfg(feature = "integrated-timers")]
@ -346,7 +346,7 @@ impl Executor {
/// In this case, the task's Future must be Send. This is because this is effectively /// In this case, the task's Future must be Send. This is because this is effectively
/// sending the task to the executor thread. /// sending the task to the executor thread.
pub(super) unsafe fn spawn(&'static self, task: TaskRef) { pub(super) unsafe fn spawn(&'static self, task: TaskRef) {
task.header().executor.set(self); task.header().executor.set(Some(self));
#[cfg(feature = "rtos-trace")] #[cfg(feature = "rtos-trace")]
trace::task_new(task.as_ptr() as u32); trace::task_new(task.as_ptr() as u32);
@ -455,7 +455,7 @@ pub fn wake_task(task: TaskRef) {
// We have just marked the task as scheduled, so enqueue it. // We have just marked the task as scheduled, so enqueue it.
unsafe { unsafe {
let executor = &*header.executor.get(); let executor = header.executor.get().unwrap_unchecked();
executor.enqueue(cs, task); executor.enqueue(cs, task);
} }
}) })

12
embassy-executor/src/spawner.rs
View File

@ -89,10 +89,10 @@ impl Spawner {
/// ///
/// Panics if the current executor is not an Embassy executor. /// Panics if the current executor is not an Embassy executor.
pub async fn for_current_executor() -> Self { pub async fn for_current_executor() -> Self {
poll_fn(|cx| unsafe { poll_fn(|cx| {
let task = raw::task_from_waker(cx.waker()); let task = raw::task_from_waker(cx.waker());
let executor = task.header().executor.get(); let executor = unsafe { task.header().executor.get().unwrap_unchecked() };
Poll::Ready(Self::new(&*executor)) Poll::Ready(Self::new(executor))
}) })
.await .await
} }
@ -165,10 +165,10 @@ impl SendSpawner {
/// ///
/// Panics if the current executor is not an Embassy executor. /// Panics if the current executor is not an Embassy executor.
pub async fn for_current_executor() -> Self { pub async fn for_current_executor() -> Self {
poll_fn(|cx| unsafe { poll_fn(|cx| {
let task = raw::task_from_waker(cx.waker()); let task = raw::task_from_waker(cx.waker());
let executor = task.header().executor.get(); let executor = unsafe { task.header().executor.get().unwrap_unchecked() };
Poll::Ready(Self::new(&*executor)) Poll::Ready(Self::new(executor))
}) })
.await .await
} }