From 3e165f2a42b8f3c66e3e77742a54feb875ec4bd6 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 21 Apr 2017 15:31:02 -0500 Subject: drop `lock` methods, add `raise_to` function --- tests/cfail/lock.rs | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'tests/cfail/lock.rs') diff --git a/tests/cfail/lock.rs b/tests/cfail/lock.rs index c69c0df..60a441c 100644 --- a/tests/cfail/lock.rs +++ b/tests/cfail/lock.rs @@ -6,32 +6,44 @@ static R1: Resource = Resource::new(0); // You CAN'T lock a resource with ceiling C from a task with priority P if P > C fn j1(prio: P3) { - R1.lock(&prio, |_, _| {}); - //~^ error + let ceil = prio.as_ceiling(); + + rtfm::raise_to(ceil, &R1, |ceil| { + //~^ error + }); } // DON'T lock a resource with ceiling equal to the task priority. // Instead use `borrow` fn j2(prio: P2) { - R1.lock(&prio, |_, _| {}); + let ceil = prio.as_ceiling(); + + rtfm::raise_to(ceil, &R1, |_| {}); //~^ error // OK - let r1 = R1.borrow(&prio, prio.as_ceiling()); + let r1 = R1.borrow(&prio, ceil); } // You CAN lock a resource with ceiling C from a task with priority P if C > P fn j3(prio: P1) { + let ceil = prio.as_ceiling(); + // OK - R1.lock(&prio, |r1, _| {}); + rtfm::raise_to(ceil, &R1, |ceil| { + let r1 = R1.borrow(&prio, ceil); + }) } static R2: Resource = Resource::new(0); // Tasks with priority less than P16 can't lock a resource with ceiling C16 fn j4(prio: P1) { - R2.lock(&prio, |_, _| {}); - //~^ error + let ceil = prio.as_ceiling(); + + rtfm::raise_to(ceil, &R2, |ceil| { + //~^ error + }); } // Only tasks with priority P16 can claim a resource with ceiling C16 -- cgit v1.2.3