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

Remove WakerHack for good.

Browse Source 
Now that 1.83 xtensa is out, we can remove it unconditionally.
This commit is contained in:
Dario Nieuwenhuis 2024-12-17 13:06:31 +01:00
parent d3f0294fb1
commit fc25fca00b
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,22 +32,11 @@ 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 {
struct WakerHack {
data: *const (),
vtable: &'static RawWakerVTable,
}
// safety: OK because WakerHack has the same layout as Waker.
// This is not really guaranteed because the structs are `repr(Rust)`, it is
// indeed the case in the current implementation.
// TODO use waker_getters when stable. https://github.com/rust-lang/rust/issues/96992
let hack: &WakerHack = unsafe { core::mem::transmute(waker) };
// make sure to compare vtable addresses. Doing `==` on the references // make sure to compare vtable addresses. Doing `==` on the references
// will compare the contents, which is slower. // will compare the contents, which is slower.
if hack.vtable as *const _ != &VTABLE as *const _ { if waker.vtable() as *const _ != &VTABLE as *const _ {
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(hack.data as *const TaskHeader) } unsafe { TaskRef::from_ptr(waker.data() as *const TaskHeader) }
} }