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

raise_to -> Ceiling.raise

Browse source
This commit is contained in:
Jorge Aparicio 2017-04-21 15:41:03 -05:00
parent 3e165f2a42
commit 1c82f1b119
6 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/lib.rs
View file

@ -522,31 +522,6 @@ where
r
}
/// Raises the system ceiling to match `resource`'s ceiling
#[cfg(not(thumbv6m))]
pub fn raise_to<R, CURRENT, HIGHER, RES, F>(
_current_ceiling: &C<CURRENT>,
_resource: &RES,
f: F,
) -> R
where
F: FnOnce(&C<HIGHER>) -> R,
RES: ResourceLike<Ceiling = HIGHER>,
HIGHER: Cmp<CURRENT, Output = Greater>,
HIGHER: Cmp<UMAX, Output = Less>,
HIGHER: Unsigned,
{
unsafe {
let old_basepri = basepri::read();
basepri_max::write(logical2hw(HIGHER::to_u8()));
barrier!();
let ret = f(&C { _marker: PhantomData });
barrier!();
basepri::write(old_basepri);
ret
}
}
/// Requests the execution of a `task`
pub fn request<T, PRIORITY>(_task: fn(T, P<PRIORITY>))
where
@ -586,6 +561,28 @@ pub struct C<T> {
_marker: PhantomData<T>,
}
impl<CURRENT> C<CURRENT> {
/// Raises the ceiling to match `resource`'s ceiling
pub fn raise<HIGHER, RES, R, F>(&self, _resource: &'static RES, f: F) -> R
where
RES: ResourceLike<Ceiling = HIGHER>,
HIGHER: Cmp<CURRENT, Output = Greater>,
HIGHER: Cmp<UMAX, Output = Less>,
HIGHER: Unsigned,
F: FnOnce(&C<HIGHER>) -> R,
{
unsafe {
let old_basepri = basepri::read();
basepri_max::write(logical2hw(HIGHER::to_u8()));
barrier!();
let ret = f(&C { _marker: PhantomData });
barrier!();
basepri::write(old_basepri);
ret
}
}
}
/// A type-level priority
pub struct P<T> {
_marker: PhantomData<T>,

2
tests/cfail/borrow.rs
View file

@ -12,7 +12,7 @@ static R6: Resource<i32, C2> = Resource::new(0);
fn j1(prio: P2) {
let ceil = prio.as_ceiling();
rtfm::raise_to(ceil, &R1, |ceil| {
ceil.raise(&R1, |ceil| {
// CAN borrow a resource with ceiling C when the current ceiling SC > C
let r2 = R2.borrow(&prio, ceil);

2
tests/cfail/ceiling.rs
View file

@ -7,7 +7,7 @@ static R1: Resource<(), C3> = Resource::new(());
fn j1(prio: P2) {
let ceil = prio.as_ceiling();
let c3 = rtfm::raise_to(ceil, &R1, |ceil| {
let c3 = ceil.raise(&R1, |ceil| {
// forbidden: ceiling token can't outlive critical section
ceil //~ error
});

8
tests/cfail/lock.rs
View file

@ -8,7 +8,7 @@ static R1: Resource<i32, C2> = Resource::new(0);
fn j1(prio: P3) {
let ceil = prio.as_ceiling();
rtfm::raise_to(ceil, &R1, |ceil| {
ceil.raise(&R1, |ceil| {
//~^ error
});
}
@ -18,7 +18,7 @@ fn j1(prio: P3) {
fn j2(prio: P2) {
let ceil = prio.as_ceiling();
rtfm::raise_to(ceil, &R1, |_| {});
ceil.raise(&R1, |_| {});
//~^ error
// OK
@ -30,7 +30,7 @@ fn j3(prio: P1) {
let ceil = prio.as_ceiling();
// OK
rtfm::raise_to(ceil, &R1, |ceil| {
ceil.raise(&R1, |ceil| {
let r1 = R1.borrow(&prio, ceil);
})
}
@ -41,7 +41,7 @@ static R2: Resource<i32, C16> = Resource::new(0);
fn j4(prio: P1) {
let ceil = prio.as_ceiling();
rtfm::raise_to(ceil, &R2, |ceil| {
ceil.raise(&R2, |ceil| {
//~^ error
});
}

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

@ -7,7 +7,7 @@ static R1: Resource<i32, C2> = Resource::new(0);
fn j1(prio: P1) {
let ceil = prio.as_ceiling();
rtfm::raise_to(&ceil, &R1, |ceil| {
ceil.raise(&R1, |ceil| {
let r1 = R1.borrow(&prio, ceil);
// Would preempt this critical section

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

@ -8,7 +8,7 @@ static R2: Resource<i32, C4> = Resource::new(0);
fn j1(prio: P1) {
let ceil = prio.as_ceiling();
rtfm::raise_to(ceil, &R1, |ceil| {
ceil.raise(&R1, |ceil| {
let r1 = R1.borrow(&prio, ceil);
// Would preempt this critical section
@ -19,7 +19,7 @@ fn j1(prio: P1) {
fn j2(prio: P3) {
let ceil = prio.as_ceiling();
rtfm::raise_to(ceil, &R2, |ceil| {
ceil.raise(&R2, |ceil| {
// OK C2 (R1's ceiling) <= C4 (system ceiling)
// BAD C2 (R1's ceiling) < P3 (j2's priority)
let r1 = R1.borrow(&prio, ceil);