Fix codegen when having executor at multiple priorities

The codegen generated code for all executors in all
dispatchers, which caused some weird bugs.
Also the definition of an executor was not generated
globally, this caused use after free errors when having
multiple priority levels.
This commit is contained in:
Emil Fresk 2022-08-05 08:59:16 +02:00
parent 4488ac0421
commit b48a95e879
4 changed files with 109 additions and 20 deletions

View file

@ -0,0 +1,73 @@
#![no_main]
#![no_std]
#![feature(type_alias_impl_trait)]
use panic_semihosting as _;
// NOTES:
//
// - Async tasks cannot have `#[lock_free]` resources, as they can interleve and each async
// task can have a mutable reference stored.
// - Spawning an async task equates to it being polled once.
#[rtic::app(device = lm3s6965, dispatchers = [SSI0, UART0], peripherals = true)]
mod app {
use cortex_m_semihosting::{debug, hprintln};
use systick_monotonic::*;
#[shared]
struct Shared {}
#[local]
struct Local {}
#[monotonic(binds = SysTick, default = true)]
type MyMono = Systick<100>;
#[init]
fn init(cx: init::Context) -> (Shared, Local, init::Monotonics) {
hprintln!("init").unwrap();
normal_task::spawn().ok();
async_task::spawn().ok();
normal_task2::spawn().ok();
async_task2::spawn().ok();
(
Shared {},
Local {},
init::Monotonics(Systick::new(cx.core.SYST, 12_000_000)),
)
}
#[idle]
fn idle(_: idle::Context) -> ! {
// debug::exit(debug::EXIT_SUCCESS);
loop {
// hprintln!("idle");
cortex_m::asm::wfi(); // put the MCU in sleep mode until interrupt occurs
}
}
#[task(priority = 1)]
fn normal_task(_cx: normal_task::Context) {
hprintln!("hello from normal 1").ok();
}
#[task(priority = 1)]
async fn async_task(_cx: async_task::Context) {
hprintln!("hello from async 1").ok();
debug::exit(debug::EXIT_SUCCESS);
}
#[task(priority = 2)]
fn normal_task2(_cx: normal_task2::Context) {
hprintln!("hello from normal 2").ok();
}
#[task(priority = 2)]
async fn async_task2(_cx: async_task2::Context) {
hprintln!("hello from async 2").ok();
}
}

View file

@ -40,7 +40,11 @@ pub fn app(app: &App, _analysis: &Analysis) -> parse::Result<Extra> {
}) })
.collect::<HashSet<_>>(); .collect::<HashSet<_>>();
let need = priorities.len(); let need = priorities
.iter()
// Only count if not 0
.filter_map(|prio| if *prio > 0 { Some(prio) } else { None })
.count();
let given = app.args.extern_interrupts.len(); let given = app.args.extern_interrupts.len();
if need > given { if need > given {
let s = { let s = {

View file

@ -10,6 +10,21 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
let interrupts = &analysis.interrupts; let interrupts = &analysis.interrupts;
// Generate executor definition in global scope
for (name, task) in app.software_tasks.iter() {
if task.is_async {
let type_name = util::internal_task_ident(name, "F");
let exec_name = util::internal_task_ident(name, "EXEC");
items.push(quote!(
type #type_name = impl core::future::Future + 'static;
static #exec_name:
rtic::RacyCell<rtic::export::executor::AsyncTaskExecutor<#type_name>> =
rtic::RacyCell::new(rtic::export::executor::AsyncTaskExecutor::new());
));
}
}
for (&level, channel) in &analysis.channels { for (&level, channel) in &analysis.channels {
let mut stmts = vec![]; let mut stmts = vec![];
@ -123,24 +138,17 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
for (name, task) in app.software_tasks.iter() { let n_executors = channel
if task.is_async { .tasks
let type_name = util::internal_task_ident(name, "F");
let exec_name = util::internal_task_ident(name, "EXEC");
stmts.push(quote!(
type #type_name = impl core::future::Future + 'static;
static #exec_name:
rtic::RacyCell<rtic::export::executor::AsyncTaskExecutor<#type_name>> =
rtic::RacyCell::new(rtic::export::executor::AsyncTaskExecutor::new());
));
}
}
let n_executors = app
.software_tasks
.iter() .iter()
.map(|(_, task)| if task.is_async { 1 } else { 0 }) .map(|name| {
let task = &app.software_tasks[name];
if task.is_async {
1
} else {
0
}
})
.sum::<usize>() .sum::<usize>()
.max(1); .max(1);
@ -165,9 +173,10 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
} }
)); ));
for (name, _task) in app.software_tasks.iter().filter_map(|(name, task)| { for name in channel.tasks.iter().filter_map(|name| {
let task = &app.software_tasks[name];
if task.is_async { if task.is_async {
Some((name, task)) Some(name)
} else { } else {
None None
} }

View file

@ -80,6 +80,9 @@ pub fn codegen(
(mod_app, root_idle, user_idle, call_idle) (mod_app, root_idle, user_idle, call_idle)
} else { } else {
// TODO: No idle defined, check for 0-priority tasks and generate an executor if needed
//
( (
vec![], vec![],
vec![], vec![],