mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2025-12-18 05:45:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Ensure local_spawner is added as a field to Context

Browse source
This commit is contained in:
Albin Hedman 2025-11-19 22:40:50 +01:00
parent 92137f2884
commit e0d4627e35
1 changed files with 44 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rtic-macros/src/codegen/module.rs
View file

@ -113,6 +113,17 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
let internal_context_name = util::internal_task_ident(name, "Context"); let internal_context_name = util::internal_task_ident(name, "Context");
let exec_name = util::internal_task_ident(name, "EXEC"); let exec_name = util::internal_task_ident(name, "EXEC");
if let Context::SoftwareTask(t) = ctxt {
let local_spawner = util::internal_task_ident(t, "LocalSpawner");
fields.push(quote! {
/// Used to spawn tasks on the same executor
///
/// This is useful for tasks that take args which are !Send/!Sync.
pub local_spawner: #local_spawner
});
values.push(quote!(local_spawner: #local_spawner { _p: core::marker::PhantomData }));
}
items.push(quote!( items.push(quote!(
#(#cfgs)* #(#cfgs)*
/// Execution context /// Execution context
@ -228,14 +239,8 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
.filter(|(_, t)| t.args.priority == priority) .filter(|(_, t)| t.args.priority == priority)
.collect(); .collect();
if !tasks_on_same_executor.is_empty() {
let local_spawner = util::internal_task_ident(t, "LocalSpawner"); let local_spawner = util::internal_task_ident(t, "LocalSpawner");
fields.push(quote! {
/// Used to spawn tasks on the same executor
///
/// This is useful for tasks that take args which are !Send/!Sync.
pub local_spawner: #local_spawner
});
let tasks = tasks_on_same_executor let tasks = tasks_on_same_executor
.iter() .iter()
.map(|(ident, task)| { .map(|(ident, task)| {
@ -262,7 +267,6 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
} }
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
values.push(quote!(local_spawner: #local_spawner { _p: core::marker::PhantomData }));
items.push(quote! { items.push(quote! {
struct #local_spawner { struct #local_spawner {
_p: core::marker::PhantomData<*mut ()>, _p: core::marker::PhantomData<*mut ()>,
@ -272,7 +276,6 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
#(#tasks)* #(#tasks)*
} }
}); });
}
module_items.push(quote!( module_items.push(quote!(
#(#cfgs)* #(#cfgs)*