aboutsummaryrefslogtreecommitdiff
path: root/embassy-executor
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-03-30 17:55:55 +0200
committerDario Nieuwenhuis <[email protected]>2023-03-30 17:55:55 +0200
commit80972f1e0e6b6d409cc4d86202608c22e5ee3e5a (patch)
tree3465f890980bdcb8b296cadb8d0aa0fc4c0cace4 /embassy-executor
parent754bb802ba377c19be97d092c4b2afe542de20b5 (diff)
executor,sync: add support for turbo-wakers.
This is a `core` patch to make wakers 1 word (the task pointer) instead of 2 (task pointer + vtable). It allows having the "waker optimization" we had a while back on `WakerRegistration/AtomicWaker`, but EVERYWHERE, without patching all crates. Advantages: - Less memory usage. - Faster. - `AtomicWaker` can actually use atomics to load/store the waker, No critical section needed. - No `dyn` call, which means `cargo-call-stack` can now see through wakes. Disadvantages: - You have to patch `core`... - Breaks all executors and other things that create wakers, unless they opt in to using the new `from_ptr` API. How to use: - Run this shell script to patch `core`. https://gist.github.com/Dirbaio/c67da7cf318515181539122c9d32b395 - Enable `build-std` - Enable `build-std-features = core/turbowakers` - Enable feature `turbowakers` in `embassy-executor`, `embassy-sync`. - Make sure you have no other crate creating wakers other than `embassy-executor`. These will panic at runtime. Note that the patched `core` is equivalent to the unpached one when the `turbowakers` feature is not enabled, so it should be fine to leave it there.
Diffstat (limited to 'embassy-executor')
-rw-r--r--embassy-executor/Cargo.toml2
-rw-r--r--embassy-executor/src/raw/mod.rs1
-rw-r--r--embassy-executor/src/raw/waker_turbo.rs34
3 files changed, 37 insertions, 0 deletions
diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml
index c2868eb98..8ad3fd698 100644
--- a/embassy-executor/Cargo.toml
+++ b/embassy-executor/Cargo.toml
@@ -38,6 +38,8 @@ wasm = ["dep:wasm-bindgen", "dep:js-sys"]
38# Enable nightly-only features 38# Enable nightly-only features
39nightly = [] 39nightly = []
40 40
41turbowakers = []
42
41integrated-timers = ["dep:embassy-time"] 43integrated-timers = ["dep:embassy-time"]
42 44
43# Trace interrupt invocations with rtos-trace. 45# Trace interrupt invocations with rtos-trace.
diff --git a/embassy-executor/src/raw/mod.rs b/embassy-executor/src/raw/mod.rs
index 15ff18fc8..72c367c33 100644
--- a/embassy-executor/src/raw/mod.rs
+++ b/embassy-executor/src/raw/mod.rs
@@ -11,6 +11,7 @@ mod run_queue;
11#[cfg(feature = "integrated-timers")] 11#[cfg(feature = "integrated-timers")]
12mod timer_queue; 12mod timer_queue;
13pub(crate) mod util; 13pub(crate) mod util;
14#[cfg_attr(feature = "turbowakers", path = "waker_turbo.rs")]
14mod waker; 15mod waker;
15 16
16use core::future::Future; 17use core::future::Future;
diff --git a/embassy-executor/src/raw/waker_turbo.rs b/embassy-executor/src/raw/waker_turbo.rs
new file mode 100644
index 000000000..435a0ff7e
--- /dev/null
+++ b/embassy-executor/src/raw/waker_turbo.rs
@@ -0,0 +1,34 @@
1use core::ptr::NonNull;
2use core::task::Waker;
3
4use super::{wake_task, TaskHeader, TaskRef};
5
6pub(crate) unsafe fn from_task(p: TaskRef) -> Waker {
7 Waker::from_turbo_ptr(NonNull::new_unchecked(p.as_ptr() as _))
8}
9
10/// Get a task pointer from a waker.
11///
12/// This can be used as an optimization in wait queues to store task pointers
13/// (1 word) instead of full Wakers (2 words). This saves a bit of RAM and helps
14/// avoid dynamic dispatch.
15///
16/// You can use the returned task pointer to wake the task with [`wake_task`](super::wake_task).
17///
18/// # Panics
19///
20/// Panics if the waker is not created by the Embassy executor.
21pub fn task_from_waker(waker: &Waker) -> TaskRef {
22 let ptr = waker.as_turbo_ptr().as_ptr();
23
24 // safety: our wakers are always created with `TaskRef::as_ptr`
25 unsafe { TaskRef::from_ptr(ptr as *const TaskHeader) }
26}
27
28#[inline(never)]
29#[no_mangle]
30fn _turbo_wake(ptr: NonNull<()>) {
31 // safety: our wakers are always created with `TaskRef::as_ptr`
32 let task = unsafe { TaskRef::from_ptr(ptr.as_ptr() as *const TaskHeader) };
33 wake_task(task)
34}