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

make the ceiling part of the task signature

Browse source 
remove the P.as_ceiling method
This commit is contained in:
Jorge Aparicio 2017-04-27 19:06:22 -05:00
parent ec2df608ca
commit e2bde8d21a
14 changed files with 325 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/cfail/access.rs
View file

@ -9,9 +9,7 @@ static R4: Resource<i32, C5> = Resource::new(0);
static R5: Resource<i32, C1> = Resource::new(0);
static R6: Resource<i32, C2> = Resource::new(0);
fn j1(prio: P2) {
let ceil = prio.as_ceiling();
fn j1(prio: P2, ceil: C2) {
ceil.raise(
&R1, |ceil| {
// NOTE SC = System Ceiling, P = task Priority

6
tests/cfail/ceiling.rs
View file

@ -1,12 +1,10 @@
extern crate cortex_m_rtfm as rtfm;
use rtfm::{C3, P0, P2, Resource};
use rtfm::{C2, C3, P0, P2, Resource};
static R1: Resource<(), C3> = Resource::new(());
fn j1(prio: P2) {
let ceil = prio.as_ceiling();
fn j1(prio: P2, ceil: C2) {
let c3 = ceil.raise(
&R1, |ceil| {
// forbidden: ceiling token can't outlive the critical section

24
tests/cfail/lock.rs
View file

@ -1,34 +1,28 @@
extern crate cortex_m_rtfm as rtfm;
use rtfm::{C16, C2, P1, P16, P2, P3, Resource};
use rtfm::{C16, C1, C2, C3, P1, P16, P2, P3, Resource};
static R1: Resource<i32, C2> = Resource::new(0);
// You CAN'T use `raise` to lower the system ceiling
fn j1(prio: P3) {
let ceil = prio.as_ceiling();
fn j1(prio: P3, ceil: C3) {
ceil.raise(&R1, |ceil| {});
//~^ error
}
// You don't need to raise the ceiling to access a resource with ceiling equal
// to the task priority.
fn j2(prio: P2) {
let ceil = prio.as_ceiling();
fn j2(prio: P2, ceil: C2) {
ceil.raise(&R1, |_| {});
//~^ error
// OK
let r1 = R1.access(&prio, ceil);
let r1 = R1.access(&prio, &ceil);
}
// You CAN access a resource with ceiling C from a task with priority P if C > P
// and you raise the ceiling first
fn j3(prio: P1) {
let ceil = prio.as_ceiling();
fn j3(prio: P1, ceil: C1) {
// OK
ceil.raise(&R1, |ceil| { let r1 = R1.access(&prio, ceil); })
}
@ -36,15 +30,13 @@ fn j3(prio: P1) {
static R2: Resource<i32, C16> = Resource::new(0);
// Tasks with priority less than P16 can't access a resource with ceiling C16
fn j4(prio: P1) {
let ceil = prio.as_ceiling();
fn j4(prio: P1, ceil: C1) {
ceil.raise(&R2, |ceil| {});
//~^ error
}
// Only tasks with priority P16 can access a resource with ceiling C16
fn j5(prio: P16) {
fn j5(prio: P16, ceil: C16) {
// OK
let r2 = R2.access(&prio, prio.as_ceiling());
let r2 = R2.access(&prio, &ceil);
}

4
tests/cfail/peripherals-alias-2.rs
View file

@ -6,7 +6,7 @@
#[macro_use]
extern crate cortex_m_rtfm as rtfm;
use rtfm::{C16, P0, P1};
use rtfm::{C0, C16, P0, P1};
use device::interrupt::Exti0;
peripherals!(device, {
@ -30,7 +30,7 @@ tasks!(device, {});
fn init(_: P0, _: &C16) {}
fn idle(_: P0) -> ! {
fn idle(_: P0, _: C0) -> ! {
loop {}
}

8
tests/cfail/race-1.rs
View file

@ -1,12 +1,10 @@
extern crate cortex_m_rtfm as rtfm;
use rtfm::{C2, C4, P1, P3, Resource};
use rtfm::{C1, C2, C3, C4, P1, P3, Resource};
static R1: Resource<i32, C2> = Resource::new(0);
fn j1(prio: P1) {
let ceil = prio.as_ceiling();
fn j1(prio: P1, ceil: C1) {
ceil.raise(
&R1, |ceil| {
let r1 = R1.access(&prio, ceil);
@ -17,7 +15,7 @@ fn j1(prio: P1) {
);
}
fn j2(_task: Task, prio: P3) {
fn j2(_task: Task, prio: P3, ceil: C3) {
rtfm::atomic(
|ceil| {
// OK C2 (R1's ceiling) <= C16 (system ceiling)

10
tests/cfail/race-2.rs
View file

@ -1,13 +1,11 @@
extern crate cortex_m_rtfm as rtfm;
use rtfm::{C2, C4, P1, P3, Resource};
use rtfm::{C1, C2, C3, C4, P1, P3, Resource};
static R1: Resource<i32, C2> = Resource::new(0);
static R2: Resource<i32, C4> = Resource::new(0);
fn j1(prio: P1) {
let ceil = prio.as_ceiling();
fn j1(prio: P1, ceil: C1) {
ceil.raise(
&R1, |ceil| {
let r1 = R1.access(&prio, ceil);
@ -18,9 +16,7 @@ fn j1(prio: P1) {
);
}
fn j2(_task: Task, prio: P3) {
let ceil = prio.as_ceiling();
fn j2(_task: Task, prio: P3, ceil: C3) {
ceil.raise(
&R2, |ceil| {
// OK C2 (R1's ceiling) <= C4 (system ceiling)

37
tests/cfail/tasks-p0.rs
View file

@ -1,11 +1,11 @@
// error-pattern: type mismatch
// error-pattern: expected struct `typenum::Equal`, found struct `typenum::Greater`
#![feature(used)]
#[macro_use]
extern crate cortex_m_rtfm as rtfm;
use rtfm::{C16, P0, P1};
use rtfm::{C0, C1, C16, P0, P1};
use device::interrupt::Exti0;
// WRONG: Tasks can't have a priority of 0.
@ -20,11 +20,11 @@ tasks!(device, {
fn init(_: P0, _: &C16) {}
fn idle(_: P0) -> ! {
fn idle(_: P0, _: C0) -> ! {
loop {}
}
fn j1(_task: Exti0, _prio: P1) {}
fn j1(_task: Exti0, _prio: P1, _ceil: C1) {}
// fake device crate
extern crate core;
@ -32,6 +32,7 @@ extern crate cortex_m;
mod device {
pub mod interrupt {
use cortex_m::ctxt::Context;
use cortex_m::interrupt::Nr;
extern "C" fn default_handler<T>(_: T) {}
@ -39,14 +40,17 @@ mod device {
pub struct Handlers {
pub Exti0: extern "C" fn(Exti0),
pub Exti1: extern "C" fn(Exti1),
pub Exti2: extern "C" fn(Exti2),
}
pub struct Exti0;
pub struct Exti1;
pub struct Exti2;
pub enum Interrupt {
Exti0,
Exti1,
Exti2,
}
unsafe impl Nr for Interrupt {
@ -55,9 +59,34 @@ mod device {
}
}
unsafe impl Context for Exti0 {}
unsafe impl Nr for Exti0 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti1 {}
unsafe impl Nr for Exti1 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti2 {}
unsafe impl Nr for Exti2 {
fn nr(&self) -> u8 {
0
}
}
pub const DEFAULT_HANDLERS: Handlers = Handlers {
Exti0: default_handler,
Exti1: default_handler,
Exti2: default_handler,
};
}
}

41
tests/cfail/tasks-same-handler.rs
View file

@ -1,12 +1,12 @@
// error-pattern: specified more than once
// error-pattern: field `Exti0` specified more than once
#![feature(used)]
#[macro_use]
extern crate cortex_m_rtfm as rtfm;
use rtfm::{C16, P0, P1, P2};
use device::interrupt::Exti0;
use rtfm::{C0, C1, C16, C2, P0, P1, P2};
use device::interrupt::{Exti0, Exti1};
// WRONG: Two tasks mapped to the same interrupt handler
tasks!(device, {
@ -24,13 +24,13 @@ tasks!(device, {
fn init(_: P0, _: &C16) {}
fn idle(_: P0) -> ! {
fn idle(_: P0, _: C0) -> ! {
loop {}
}
fn j1(_task: Exti0, _prio: P1) {}
fn j1(_task: Exti0, _prio: P1, _ceil: C1) {}
fn j2(_task: Exti0, _prio: P1) {}
fn j2(_task: Exti0, _prio: P2, _ceil: C2) {}
// fake device crate
extern crate core;
@ -38,6 +38,7 @@ extern crate cortex_m;
mod device {
pub mod interrupt {
use cortex_m::ctxt::Context;
use cortex_m::interrupt::Nr;
extern "C" fn default_handler<T>(_: T) {}
@ -45,14 +46,17 @@ mod device {
pub struct Handlers {
pub Exti0: extern "C" fn(Exti0),
pub Exti1: extern "C" fn(Exti1),
pub Exti2: extern "C" fn(Exti2),
}
pub struct Exti0;
pub struct Exti1;
pub struct Exti2;
pub enum Interrupt {
Exti0,
Exti1,
Exti2,
}
unsafe impl Nr for Interrupt {
@ -61,9 +65,34 @@ mod device {
}
}
unsafe impl Context for Exti0 {}
unsafe impl Nr for Exti0 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti1 {}
unsafe impl Nr for Exti1 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti2 {}
unsafe impl Nr for Exti2 {
fn nr(&self) -> u8 {
0
}
}
pub const DEFAULT_HANDLERS: Handlers = Handlers {
Exti0: default_handler,
Exti1: default_handler,
Exti2: default_handler,
};
}
}

91
tests/cfail/tasks-wrong-ceiling.rs Normal file
View file

@ -0,0 +1,91 @@
// error-pattern: mismatched types
#![feature(used)]
#[macro_use]
extern crate cortex_m_rtfm as rtfm;
use rtfm::{C0, C1, C16, C2, P0, P1};
use device::interrupt::Exti0;
tasks!(device, {
j1: Task {
interrupt: Exti0,
priority: P1,
enabled: true,
},
});
fn init(_: P0, _: &C16) {}
fn idle(_: P0, _: C0) -> ! {
loop {}
}
// Wrong ceiling token. `prio` and `ceil` must match in levels
fn j1(_task: Exti0, _prio: P1, _ceil: C2) {}
// fake device crate
extern crate core;
extern crate cortex_m;
mod device {
pub mod interrupt {
use cortex_m::ctxt::Context;
use cortex_m::interrupt::Nr;
extern "C" fn default_handler<T>(_: T) {}
pub struct Handlers {
pub Exti0: extern "C" fn(Exti0),
pub Exti1: extern "C" fn(Exti1),
pub Exti2: extern "C" fn(Exti2),
}
pub struct Exti0;
pub struct Exti1;
pub struct Exti2;
pub enum Interrupt {
Exti0,
Exti1,
Exti2,
}
unsafe impl Nr for Interrupt {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti0 {}
unsafe impl Nr for Exti0 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti1 {}
unsafe impl Nr for Exti1 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti2 {}
unsafe impl Nr for Exti2 {
fn nr(&self) -> u8 {
0
}
}
pub const DEFAULT_HANDLERS: Handlers = Handlers {
Exti0: default_handler,
Exti1: default_handler,
Exti2: default_handler,
};
}
}

39
tests/cfail/tasks-wrong-idle.rs
View file

@ -6,7 +6,7 @@
extern crate cortex_m_rtfm as rtfm;
use device::interrupt::Exti0;
use rtfm::{C16, P0, P1};
use rtfm::{C0, C1, C16, P0, P1};
tasks!(device, {
j1: Task {
@ -18,12 +18,10 @@ tasks!(device, {
fn init(_: P0, _: &C16) {}
// WRONG. `idle` must have signature `fn(P0) -> !`
fn idle(_: P1) -> ! {
loop {}
}
// WRONG. `idle` must have signature `fn(P0, C0) -> !`
fn idle(_: P0, _: C0) {}
fn j1(_task: Exti0, _prio: P1) {}
fn j1(_task: Exti0, _prio: P1, _ceil: C1) {}
// fake device crate
extern crate core;
@ -31,6 +29,7 @@ extern crate cortex_m;
mod device {
pub mod interrupt {
use cortex_m::ctxt::Context;
use cortex_m::interrupt::Nr;
extern "C" fn default_handler<T>(_: T) {}
@ -38,14 +37,17 @@ mod device {
pub struct Handlers {
pub Exti0: extern "C" fn(Exti0),
pub Exti1: extern "C" fn(Exti1),
pub Exti2: extern "C" fn(Exti2),
}
pub struct Exti0;
pub struct Exti1;
pub struct Exti2;
pub enum Interrupt {
Exti0,
Exti1,
Exti2,
}
unsafe impl Nr for Interrupt {
@ -54,9 +56,34 @@ mod device {
}
}
unsafe impl Context for Exti0 {}
unsafe impl Nr for Exti0 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti1 {}
unsafe impl Nr for Exti1 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti2 {}
unsafe impl Nr for Exti2 {
fn nr(&self) -> u8 {
0
}
}
pub const DEFAULT_HANDLERS: Handlers = Handlers {
Exti0: default_handler,
Exti1: default_handler,
Exti2: default_handler,
};
}
}

35
tests/cfail/tasks-wrong-init.rs
View file

@ -5,7 +5,7 @@
#[macro_use]
extern crate cortex_m_rtfm as rtfm;
use rtfm::{C1, P0, P1};
use rtfm::{C0, C1, C16, P0, P1};
use device::interrupt::Exti0;
tasks!(device, {
@ -19,11 +19,11 @@ tasks!(device, {
// WRONG. `init` must have signature `fn(P0, &C16)`
fn init(_: P0, _: &C1) {}
fn idle(_: P0) -> ! {
fn idle(_: P0, _: C0) -> ! {
loop {}
}
fn j1(_task: Exti0, _prio: P1) {}
fn j1(_task: Exti0, _prio: P1, _ceil: C1) {}
// fake device crate
extern crate core;
@ -31,6 +31,7 @@ extern crate cortex_m;
mod device {
pub mod interrupt {
use cortex_m::ctxt::Context;
use cortex_m::interrupt::Nr;
extern "C" fn default_handler<T>(_: T) {}
@ -38,14 +39,17 @@ mod device {
pub struct Handlers {
pub Exti0: extern "C" fn(Exti0),
pub Exti1: extern "C" fn(Exti1),
pub Exti2: extern "C" fn(Exti2),
}
pub struct Exti0;
pub struct Exti1;
pub struct Exti2;
pub enum Interrupt {
Exti0,
Exti1,
Exti2,
}
unsafe impl Nr for Interrupt {
@ -54,9 +58,34 @@ mod device {
}
}
unsafe impl Context for Exti0 {}
unsafe impl Nr for Exti0 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti1 {}
unsafe impl Nr for Exti1 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti2 {}
unsafe impl Nr for Exti2 {
fn nr(&self) -> u8 {
0
}
}
pub const DEFAULT_HANDLERS: Handlers = Handlers {
Exti0: default_handler,
Exti1: default_handler,
Exti2: default_handler,
};
}
}

37
tests/cfail/tasks-wrong-priority.rs
View file

@ -5,8 +5,8 @@
#[macro_use]
extern crate cortex_m_rtfm as rtfm;
use cortex_m_srp::{C16, P0, P1, P2};
use device::interrupt::Exti1;
use device::interrupt::Exti0;
use rtfm::{C0, C1, C16, C2, P0, P1, P2};
tasks!(device, {
j1: Task {
@ -18,12 +18,12 @@ tasks!(device, {
fn init(_: P0, _: &C16) {}
fn idle(_: P0) -> ! {
fn idle(_: P0, _: C0) -> ! {
loop {}
}
// Wrong priority token. Declared P1, got P2
fn j1(_task: Exti1, _prio: P1) {}
fn j1(_task: Exti0, _prio: P2, _ceil: C2) {}
// fake device crate
extern crate core;
@ -31,6 +31,7 @@ extern crate cortex_m;
mod device {
pub mod interrupt {
use cortex_m::ctxt::Context;
use cortex_m::interrupt::Nr;
extern "C" fn default_handler<T>(_: T) {}
@ -38,14 +39,17 @@ mod device {
pub struct Handlers {
pub Exti0: extern "C" fn(Exti0),
pub Exti1: extern "C" fn(Exti1),
pub Exti2: extern "C" fn(Exti2),
}
pub struct Exti0;
pub struct Exti1;
pub struct Exti2;
pub enum Interrupt {
Exti0,
Exti1,
Exti2,
}
unsafe impl Nr for Interrupt {
@ -54,9 +58,34 @@ mod device {
}
}
unsafe impl Context for Exti0 {}
unsafe impl Nr for Exti0 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti1 {}
unsafe impl Nr for Exti1 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti2 {}
unsafe impl Nr for Exti2 {
fn nr(&self) -> u8 {
0
}
}
pub const DEFAULT_HANDLERS: Handlers = Handlers {
Exti0: default_handler,
Exti1: default_handler,
Exti2: default_handler,
};
}
}

37
tests/cfail/tasks-wrong-task.rs
View file

@ -5,8 +5,8 @@
#[macro_use]
extern crate cortex_m_rtfm as rtfm;
use cortex_mrtfm::{C16, P0, P1};
use device::interrupt::Exti1;
use device::interrupt::{Exti0, Exti1};
use rtfm::{C0, C1, C16, P0, P1};
tasks!(device, {
j1: Task {
@ -18,12 +18,12 @@ tasks!(device, {
fn init(_: P0, _: &C16) {}
fn idle(_: P0) -> ! {
fn idle(_: P0, _: C0) -> ! {
loop {}
}
// Wrong task token. Declared Exti0, got Exti1
fn j1(_task: Exti1, _prio: P1) {}
fn j1(_task: Exti1, _prio: P1, _ceil: C1) {}
// fake device crate
extern crate core;
@ -31,6 +31,7 @@ extern crate cortex_m;
mod device {
pub mod interrupt {
use cortex_m::ctxt::Context;
use cortex_m::interrupt::Nr;
extern "C" fn default_handler<T>(_: T) {}
@ -38,14 +39,17 @@ mod device {
pub struct Handlers {
pub Exti0: extern "C" fn(Exti0),
pub Exti1: extern "C" fn(Exti1),
pub Exti2: extern "C" fn(Exti2),
}
pub struct Exti0;
pub struct Exti1;
pub struct Exti2;
pub enum Interrupt {
Exti0,
Exti1,
Exti2,
}
unsafe impl Nr for Interrupt {
@ -54,9 +58,34 @@ mod device {
}
}
unsafe impl Context for Exti0 {}
unsafe impl Nr for Exti0 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti1 {}
unsafe impl Nr for Exti1 {
fn nr(&self) -> u8 {
0
}
}
unsafe impl Context for Exti2 {}
unsafe impl Nr for Exti2 {
fn nr(&self) -> u8 {
0
}
}
pub const DEFAULT_HANDLERS: Handlers = Handlers {
Exti0: default_handler,
Exti1: default_handler,
Exti2: default_handler,
};
}
}