nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-24 15:52:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
use nightly waker_getters APIs
This commit is contained in:
Dario Nieuwenhuis 2024-06-12 23:40:53 +00:00 committed by GitHub
commit e80ca5fc67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
embassy-executor/src/lib.rs
View File

@ -1,4 +1,5 @@
#![cfg_attr(not(any(feature = "arch-std", feature = "arch-wasm")), no_std)] #![cfg_attr(not(any(feature = "arch-std", feature = "arch-wasm")), no_std)]
#![cfg_attr(feature = "nightly", feature(waker_getters))]
#![allow(clippy::new_without_default)] #![allow(clippy::new_without_default)]
#![doc = include_str!("../README.md")] #![doc = include_str!("../README.md")]
#![warn(missing_docs)] #![warn(missing_docs)]

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

@ -1,4 +1,3 @@
use core::mem;
use core::task::{RawWaker, RawWakerVTable, Waker}; use core::task::{RawWaker, RawWakerVTable, Waker};
use super::{wake_task, TaskHeader, TaskRef}; use super::{wake_task, TaskHeader, TaskRef};
@ -33,20 +32,35 @@ 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 {
#[cfg(not(feature = "nightly"))]
{
struct WakerHack {
data: *const (),
vtable: &'static RawWakerVTable,
}
// safety: OK because WakerHack has the same layout as Waker. // safety: OK because WakerHack has the same layout as Waker.
// This is not really guaranteed because the structs are `repr(Rust)`, it is // This is not really guaranteed because the structs are `repr(Rust)`, it is
// 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 { mem::transmute(waker) }; let hack: &WakerHack = unsafe { core::mem::transmute(waker) };
if hack.vtable != &VTABLE { if hack.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(hack.data as *const TaskHeader) } unsafe { TaskRef::from_ptr(hack.data as *const TaskHeader) }
} }
struct WakerHack { #[cfg(feature = "nightly")]
data: *const (), {
vtable: &'static RawWakerVTable, let raw_waker = waker.as_raw();
if raw_waker.vtable() != &VTABLE {
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(raw_waker.data() as *const TaskHeader) }
}
} }