Skip to content

Commit

Permalink
Improve error output for prios > dispatchers (rtic-rs#943)
Browse files Browse the repository at this point in the history
* Improve error output for prios > dispatchers

* Update changelog
  • Loading branch information
hegza authored May 28, 2024
1 parent 6865b69 commit 9bfd5a3
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
4 changes: 4 additions & 0 deletions rtic-macros/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!

## [Unreleased]

### Changed

- Improve error output for prios > dispatchers

## [v2.1.0] - 2024-02-27

### Added
Expand Down
22 changes: 18 additions & 4 deletions rtic-macros/src/analyze.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl ops::Deref for Analysis {

// Assign an interrupt to each priority level
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)
let priorities = app
Expand All @@ -35,12 +35,26 @@ pub fn app(analysis: analyze::Analysis, app: &App) -> Analysis {

// map from priorities to interrupts (holding name and attributes)

let interrupts: BTreeMap<Priority, _> = priorities
let nonzero_priorities = priorities
.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()
.rev()
.map(|p| (p, available_interrupt.pop().expect("UNREACHABLE")))
.map(|p| {
(
p,
available_dispatchers
.pop()
// EXPECT: covered by above assertion
.expect("UNREACHABLE"),
)
})
.collect();

let max_async_prio = app
Expand Down

0 comments on commit 9bfd5a3

Please sign in to comment.