mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-25 21:19:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

critical: don't let the ceiling token escape the critical section

Browse source
This commit is contained in:
Jorge Aparicio 2017-04-19 15:03:49 -05:00
parent aee1d785a9
commit aee3c2b29b
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib.rs
View file

@ -238,12 +238,12 @@ where
/// No task can preempt this critical section /// No task can preempt this critical section
pub fn critical<R, F>(f: F) -> R pub fn critical<R, F>(f: F) -> R
where where
F: FnOnce(CMAX) -> R, F: FnOnce(&CMAX) -> R,
{ {
let primask = ::cortex_m::register::primask::read(); let primask = ::cortex_m::register::primask::read();
::cortex_m::interrupt::disable(); ::cortex_m::interrupt::disable();
let r = f(C { _marker: PhantomData }); let r = f(&C { _marker: PhantomData });
// If the interrupts were active before our `disable` call, then re-enable // If the interrupts were active before our `disable` call, then re-enable
// them. Otherwise, keep them disabled // them. Otherwise, keep them disabled

14
tests/cfail/ceiling.rs
View file

@ -1,6 +1,6 @@
extern crate cortex_m_srp; extern crate cortex_m_srp as rtfm;
use cortex_m_srp::{C3, P2, Resource}; use rtfm::{C3, P0, P2, Resource};
static R1: Resource<(), C3> = Resource::new(()); static R1: Resource<(), C3> = Resource::new(());
@ -13,3 +13,13 @@ fn j1(prio: P2) {
// Would be bad: lockless access to a resource with ceiling = 3 // Would be bad: lockless access to a resource with ceiling = 3
let r2 = R1.borrow(&prio, c3); let r2 = R1.borrow(&prio, c3);
} }
fn j2(prio: P0) {
let c16 = rtfm::critical(|c16| {
// forbidden: ceiling token can't outlive critical section
c16 //~ error
});
// Would be bad: lockless access to a resource with ceiling = 16
let r1 = R1.borrow(&prio, c16);
}