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

Merge pull request #3529 from embassy-rs/executor-compare-vtable-addr

Browse Source 
executor: compare vtable addr instead of contents.
This commit is contained in:
Dario Nieuwenhuis 2024-11-12 15:38:15 +00:00 committed by GitHub
commit 8478729e49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,9 @@ pub fn task_from_waker(waker: &Waker) -> TaskRef {
// 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 { // make sure to compare vtable addresses. Doing `==` on the references
// will compare the contents, which is slower.
if hack.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`