mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-12-01 16:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #183 from japaric/tq-ceiling-bug

Browse source 
backport: fix ceiling analysis bug
This commit is contained in:
Jorge Aparicio 2019-05-01 20:47:18 +02:00 committed by GitHub
commit 4df6292e1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.travis.yml
View file

@ -2,18 +2,17 @@ language: rust
matrix: matrix:
include: include:
# - env: TARGET=x86_64-unknown-linux-gnu
# - env: TARGET=thumbv6m-none-eabi
# if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
# - env: TARGET=thumbv7m-none-eabi
# if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
# NOTE used to build docs on successful merges to master # NOTE used to build docs on successful merges to master
- env: TARGET=x86_64-unknown-linux-gnu
- env: TARGET=thumbv6m-none-eabi
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
- env: TARGET=thumbv7m-none-eabi
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
- env: TARGET=x86_64-unknown-linux-gnu - env: TARGET=x86_64-unknown-linux-gnu
rust: nightly rust: nightly
if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
- env: TARGET=thumbv6m-none-eabi - env: TARGET=thumbv6m-none-eabi
rust: nightly rust: nightly

9
macros/src/analyze.rs
View file

@ -190,7 +190,7 @@ pub fn app(app: &App) -> Analysis {
} }
// Ceiling analysis of free queues (consumer end point) -- first pass // Ceiling analysis of free queues (consumer end point) -- first pass
// Ceiling analysis of ready queues (producer end point) // Ceiling analysis of ready queues (producer end point) -- first pass
// Also compute more Send-ness requirements // Also compute more Send-ness requirements
let mut free_queues: HashMap<_, _> = app.tasks.keys().map(|task| (task.clone(), 0)).collect(); let mut free_queues: HashMap<_, _> = app.tasks.keys().map(|task| (task.clone(), 0)).collect();
let mut ready_queues: HashMap<_, _> = dispatchers.keys().map(|level| (*level, 0)).collect(); let mut ready_queues: HashMap<_, _> = dispatchers.keys().map(|level| (*level, 0)).collect();
@ -215,10 +215,17 @@ pub fn app(app: &App) -> Analysis {
} }
} }
// Ceiling analysis of ready queues (producer end point) -- second pass
// Ceiling analysis of free queues (consumer end point) -- second pass // Ceiling analysis of free queues (consumer end point) -- second pass
// Ceiling analysis of the timer queue // Ceiling analysis of the timer queue
let mut tq_ceiling = tq_priority; let mut tq_ceiling = tq_priority;
for (priority, task) in app.schedule_calls() { for (priority, task) in app.schedule_calls() {
// the system timer handler contends for the spawnee's dispatcher READY_QUEUE
let c = ready_queues
.entry(app.tasks[task].args.priority)
.or_default();
*c = cmp::max(*c, tq_priority);
if let Some(priority) = priority { if let Some(priority) = priority {
// Users of `schedule` contend for the to-be-spawned task FREE_QUEUE (consumer end point) // Users of `schedule` contend for the to-be-spawned task FREE_QUEUE (consumer end point)
let c = free_queues.get_mut(task).expect("BUG: free_queue.get_mut"); let c = free_queues.get_mut(task).expect("BUG: free_queue.get_mut");