nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-21 22:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3069 from zjp-CN/waker-getters

Browse Source 
minimize cfg code in task_from_waker
This commit is contained in:
Dario Nieuwenhuis 2024-06-13 00:17:26 +00:00 committed by GitHub
commit 8d79679bb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
embassy-executor/src/raw/waker.rs
View File

@ -32,6 +32,7 @@ pub(crate) unsafe fn from_task(p: TaskRef) -> Waker {
/// ///
/// Panics if the waker is not created by the Embassy executor. /// Panics if the waker is not created by the Embassy executor.
pub fn task_from_waker(waker: &Waker) -> TaskRef { pub fn task_from_waker(waker: &Waker) -> TaskRef {
let (vtable, data) = {
#[cfg(not(feature = "nightly"))] #[cfg(not(feature = "nightly"))]
{ {
struct WakerHack { struct WakerHack {
@ -44,23 +45,19 @@ pub fn task_from_waker(waker: &Waker) -> TaskRef {
// indeed the case in the current implementation. // indeed the case in the current implementation.
// TODO use waker_getters when stable. https://github.com/rust-lang/rust/issues/96992 // TODO use waker_getters when stable. https://github.com/rust-lang/rust/issues/96992
let hack: &WakerHack = unsafe { core::mem::transmute(waker) }; let hack: &WakerHack = unsafe { core::mem::transmute(waker) };
if hack.vtable != &VTABLE { (hack.vtable, hack.data)
panic!("Found waker not created by the Embassy executor. `embassy_time::Timer` only works with the Embassy executor.")
}
// safety: our wakers are always created with `TaskRef::as_ptr`
unsafe { TaskRef::from_ptr(hack.data as *const TaskHeader) }
} }
#[cfg(feature = "nightly")] #[cfg(feature = "nightly")]
{ {
let raw_waker = waker.as_raw(); let raw_waker = waker.as_raw();
(raw_waker.vtable(), raw_waker.data())
}
};
if raw_waker.vtable() != &VTABLE { if vtable != &VTABLE {
panic!("Found waker not created by the Embassy executor. `embassy_time::Timer` only works with the Embassy executor.") panic!("Found waker not created by the Embassy executor. `embassy_time::Timer` only works with the Embassy executor.")
} }
// safety: our wakers are always created with `TaskRef::as_ptr` // safety: our wakers are always created with `TaskRef::as_ptr`
unsafe { TaskRef::from_ptr(raw_waker.data() as *const TaskHeader) } unsafe { TaskRef::from_ptr(data as *const TaskHeader) }
}
} }