itsscb/embassy
1
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2025-09-28 21:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't force a wake to despawn

Browse Source
This commit is contained in:
Dániel Buga 2024-12-17 18:46:32 +01:00
parent a011f48769
commit 2ca374fc9c
No known key found for this signature in database
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,8 +215,6 @@ impl<F: Future + 'static> TaskStorage<F> {
let mut cx = Context::from_waker(&waker); let mut cx = Context::from_waker(&waker);
match future.poll(&mut cx) { match future.poll(&mut cx) {
Poll::Ready(_) => { Poll::Ready(_) => {
waker.wake_by_ref();
// As the future has finished and this function will not be called // As the future has finished and this function will not be called
// again, we can safely drop the future here. // again, we can safely drop the future here.
this.future.drop_in_place(); this.future.drop_in_place();
@ -224,6 +222,10 @@ impl<F: Future + 'static> TaskStorage<F> {
// We replace the poll_fn with a despawn function, so that the task is cleaned up // We replace the poll_fn with a despawn function, so that the task is cleaned up
// when the executor polls it next. // when the executor polls it next.
this.raw.poll_fn.set(Some(poll_to_despawn)); this.raw.poll_fn.set(Some(poll_to_despawn));
// Make sure we despawn last, so that other threads can only spawn the task
// after we're done with it.
this.raw.state.despawn();
} }
Poll::Pending => {} Poll::Pending => {}
} }

3
embassy-executor/tests/test.rs
View File

@ -69,7 +69,6 @@ fn executor_task() {
&[ &[
"pend", // spawning a task pends the executor "pend", // spawning a task pends the executor
"poll task1", // poll only once. "poll task1", // poll only once.
"pend", // task is done, wakes itself to exit
] ]
) )
} }
@ -180,7 +179,6 @@ fn waking_after_completion_does_not_poll() {
"pend", // manual wake, single pend for two wakes "pend", // manual wake, single pend for two wakes
"pend", // respawning a task pends the executor "pend", // respawning a task pends the executor
"poll task1", // "poll task1", //
"pend", // task is done, wakes itself to exit
] ]
) )
} }
@ -268,7 +266,6 @@ fn waking_with_old_waker_after_respawn() {
"yield_now", // "yield_now", //
"pend", // manual wake, gets cleared by poll "pend", // manual wake, gets cleared by poll
"poll task1", // "poll task1", //
"pend", // task is done, wakes itself to exit
] ]
); );
} }