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

Move macro helper functions to embassy-executor

Browse Source
This commit is contained in:
Matthew Tran 2025-03-29 02:45:48 -05:00
parent 35b353ab94
commit 034e9fc218
2 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
embassy-executor-macros/src/macros/task.rs
View File

@ -145,35 +145,6 @@ pub fn run(args: TokenStream, item: TokenStream) -> TokenStream {
}; };
#[cfg(not(feature = "nightly"))] #[cfg(not(feature = "nightly"))]
let mut task_outer_body = quote! { let mut task_outer_body = quote! {
// We use Fut instead of F::Fut because F::Fut causes the compiler to generate some ugly
// unrelated errors when the task has a compile error.
const fn __task_pool_size<F, Args, Fut>(_: F) -> usize
where
F: #embassy_executor::_export::TaskFn<Args, Fut = Fut>,
Fut: ::core::future::Future + 'static,
{
::core::mem::size_of::<
#embassy_executor::raw::TaskPool<Fut, POOL_SIZE>
>()
}
const fn __task_pool_align<F, Args, Fut>(_: F) -> usize
where
F: #embassy_executor::_export::TaskFn<Args, Fut = Fut>,
Fut: ::core::future::Future + 'static,
{
::core::mem::align_of::<
#embassy_executor::raw::TaskPool<Fut, POOL_SIZE>
>()
}
const fn __task_pool_new<F, Args, Fut>(_: F) -> #embassy_executor::raw::TaskPool<Fut, POOL_SIZE>
where
F: #embassy_executor::_export::TaskFn<Args, Fut = Fut>,
Fut: ::core::future::Future + 'static,
{
#embassy_executor::raw::TaskPool::new()
}
const fn __task_pool_get<F, Args, Fut>(_: F) -> &'static #embassy_executor::raw::TaskPool<Fut, POOL_SIZE> const fn __task_pool_get<F, Args, Fut>(_: F) -> &'static #embassy_executor::raw::TaskPool<Fut, POOL_SIZE>
where where
F: #embassy_executor::_export::TaskFn<Args, Fut = Fut>, F: #embassy_executor::_export::TaskFn<Args, Fut = Fut>,
@ -184,9 +155,9 @@ pub fn run(args: TokenStream, item: TokenStream) -> TokenStream {
const POOL_SIZE: usize = #pool_size; const POOL_SIZE: usize = #pool_size;
static POOL: #embassy_executor::_export::TaskPoolHolder< static POOL: #embassy_executor::_export::TaskPoolHolder<
{__task_pool_size(#task_inner_ident)}, {#embassy_executor::_export::task_pool_size::<_, _, _, POOL_SIZE>(#task_inner_ident)},
{__task_pool_align(#task_inner_ident)}, {#embassy_executor::_export::task_pool_align::<_, _, _, POOL_SIZE>(#task_inner_ident)},
> = unsafe { ::core::mem::transmute(__task_pool_new(#task_inner_ident)) }; > = unsafe { ::core::mem::transmute(#embassy_executor::_export::task_pool_new::<_, _, _, POOL_SIZE>(#task_inner_ident)) };
unsafe { __task_pool_get(#task_inner_ident)._spawn_async_fn(move || #task_inner_ident(#(#full_args,)*)) } unsafe { __task_pool_get(#task_inner_ident)._spawn_async_fn(move || #task_inner_ident(#(#full_args,)*)) }
}; };

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

@ -59,6 +59,8 @@ pub mod _export {
use core::future::Future; use core::future::Future;
use core::mem::MaybeUninit; use core::mem::MaybeUninit;
use crate::raw::TaskPool;
pub trait TaskFn<Args>: Copy { pub trait TaskFn<Args>: Copy {
type Fut: Future + 'static; type Fut: Future + 'static;
} }
@ -116,6 +118,30 @@ pub mod _export {
} }
} }
pub const fn task_pool_size<F, Args, Fut, const POOL_SIZE: usize>(_: F) -> usize
where
F: TaskFn<Args, Fut = Fut>,
Fut: Future + 'static,
{
size_of::<TaskPool<Fut, POOL_SIZE>>()
}
pub const fn task_pool_align<F, Args, Fut, const POOL_SIZE: usize>(_: F) -> usize
where
F: TaskFn<Args, Fut = Fut>,
Fut: Future + 'static,
{
align_of::<TaskPool<Fut, POOL_SIZE>>()
}
pub const fn task_pool_new<F, Args, Fut, const POOL_SIZE: usize>(_: F) -> TaskPool<Fut, POOL_SIZE>
where
F: TaskFn<Args, Fut = Fut>,
Fut: Future + 'static,
{
TaskPool::new()
}
#[allow(private_bounds)] #[allow(private_bounds)]
#[repr(transparent)] #[repr(transparent)]
pub struct Align<const N: usize>([<Self as Alignment>::Archetype; 0]) pub struct Align<const N: usize>([<Self as Alignment>::Archetype; 0])