Improve error output for prios > dispatchers (#943)

* Improve error output for prios > dispatchers

* Update changelog
This commit is contained in:
Henri Lunnikivi 2024-05-28 09:01:53 +03:00 committed by GitHub
parent 6865b69616
commit 9bfd5a3bb2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 4 deletions

View file

@ -7,6 +7,10 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
## [Unreleased] ## [Unreleased]
### Changed
- Improve error output for prios > dispatchers
## [v2.1.0] - 2024-02-27 ## [v2.1.0] - 2024-02-27
### Added ### Added

View file

@ -24,7 +24,7 @@ impl ops::Deref for Analysis {
// Assign an interrupt to each priority level // Assign an interrupt to each priority level
pub fn app(analysis: analyze::Analysis, app: &App) -> Analysis { pub fn app(analysis: analyze::Analysis, app: &App) -> Analysis {
let mut available_interrupt = app.args.dispatchers.clone(); let mut available_dispatchers = app.args.dispatchers.clone();
// the set of priorities (each priority only once) // the set of priorities (each priority only once)
let priorities = app let priorities = app
@ -35,12 +35,26 @@ pub fn app(analysis: analyze::Analysis, app: &App) -> Analysis {
// map from priorities to interrupts (holding name and attributes) // map from priorities to interrupts (holding name and attributes)
let interrupts: BTreeMap<Priority, _> = priorities let nonzero_priorities = priorities
.iter() .iter()
.filter(|prio| **prio > 0) // 0 prio tasks are run in main // 0 prio tasks are run in main
.filter(|prio| **prio > 0);
assert!(
available_dispatchers.len() >= nonzero_priorities.clone().count(),
"The number of dispatchers must be equal to or greater than the number of distinct task priorities."
);
let interrupts: BTreeMap<Priority, _> = nonzero_priorities
.copied() .copied()
.rev() .rev()
.map(|p| (p, available_interrupt.pop().expect("UNREACHABLE"))) .map(|p| {
(
p,
available_dispatchers
.pop()
// EXPECT: covered by above assertion
.expect("UNREACHABLE"),
)
})
.collect(); .collect();
let max_async_prio = app let max_async_prio = app