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 #3503 from kaspar030/task-macro-path-override

Browse Source 
executor: allow overriding `embassy_executor` path in `task` macro
This commit is contained in:
Ulf Lilleengen 2024-11-06 08:08:07 +00:00 committed by GitHub
commit 5bc4796b96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,5 @@
use std::str::FromStr;
use darling::export::NestedMeta; use darling::export::NestedMeta;
use darling::FromMeta; use darling::FromMeta;
use proc_macro2::{Span, TokenStream}; use proc_macro2::{Span, TokenStream};
@ -11,6 +13,9 @@ use crate::util::*;
struct Args { struct Args {
#[darling(default)] #[darling(default)]
pool_size: Option<syn::Expr>, pool_size: Option<syn::Expr>,
/// Use this to override the `embassy_executor` crate path. Defaults to `::embassy_executor`.
#[darling(default)]
embassy_executor: Option<syn::Expr>,
} }
pub fn run(args: TokenStream, item: TokenStream) -> TokenStream { pub fn run(args: TokenStream, item: TokenStream) -> TokenStream {
@ -42,6 +47,10 @@ pub fn run(args: TokenStream, item: TokenStream) -> TokenStream {
lit: Lit::Int(LitInt::new("1", Span::call_site())), lit: Lit::Int(LitInt::new("1", Span::call_site())),
})); }));
let embassy_executor = args
.embassy_executor
.unwrap_or(Expr::Verbatim(TokenStream::from_str("::embassy_executor").unwrap()));
if f.sig.asyncness.is_none() { if f.sig.asyncness.is_none() {
error(&mut errors, &f.sig, "task functions must be async"); error(&mut errors, &f.sig, "task functions must be async");
} }
@ -131,13 +140,13 @@ pub fn run(args: TokenStream, item: TokenStream) -> TokenStream {
} }
const POOL_SIZE: usize = #pool_size; const POOL_SIZE: usize = #pool_size;
static POOL: ::embassy_executor::raw::TaskPool<<() as _EmbassyInternalTaskTrait>::Fut, POOL_SIZE> = ::embassy_executor::raw::TaskPool::new(); static POOL: #embassy_executor::raw::TaskPool<<() as _EmbassyInternalTaskTrait>::Fut, POOL_SIZE> = #embassy_executor::raw::TaskPool::new();
unsafe { POOL._spawn_async_fn(move || <() as _EmbassyInternalTaskTrait>::construct(#(#full_args,)*)) } unsafe { POOL._spawn_async_fn(move || <() as _EmbassyInternalTaskTrait>::construct(#(#full_args,)*)) }
}; };
#[cfg(not(feature = "nightly"))] #[cfg(not(feature = "nightly"))]
let mut task_outer_body = quote! { let mut task_outer_body = quote! {
const POOL_SIZE: usize = #pool_size; const POOL_SIZE: usize = #pool_size;
static POOL: ::embassy_executor::_export::TaskPoolRef = ::embassy_executor::_export::TaskPoolRef::new(); static POOL: #embassy_executor::_export::TaskPoolRef = #embassy_executor::_export::TaskPoolRef::new();
unsafe { POOL.get::<_, POOL_SIZE>()._spawn_async_fn(move || #task_inner_ident(#(#full_args,)*)) } unsafe { POOL.get::<_, POOL_SIZE>()._spawn_async_fn(move || #task_inner_ident(#(#full_args,)*)) }
}; };
@ -146,7 +155,7 @@ pub fn run(args: TokenStream, item: TokenStream) -> TokenStream {
if !errors.is_empty() { if !errors.is_empty() {
task_outer_body = quote! { task_outer_body = quote! {
#![allow(unused_variables, unreachable_code)] #![allow(unused_variables, unreachable_code)]
let _x: ::embassy_executor::SpawnToken<()> = ::core::todo!(); let _x: #embassy_executor::SpawnToken<()> = ::core::todo!();
_x _x
}; };
} }
@ -164,7 +173,7 @@ pub fn run(args: TokenStream, item: TokenStream) -> TokenStream {
#task_inner #task_inner
#(#task_outer_attrs)* #(#task_outer_attrs)*
#visibility fn #task_ident #generics (#fargs) -> ::embassy_executor::SpawnToken<impl Sized> #where_clause{ #visibility fn #task_ident #generics (#fargs) -> #embassy_executor::SpawnToken<impl Sized> #where_clause{
#task_outer_body #task_outer_body
} }