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/borrow.rs | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'tests/cfail/borrow.rs') diff --git a/tests/cfail/borrow.rs b/tests/cfail/borrow.rs index ca246e7..d72402d 100644 --- a/tests/cfail/borrow.rs +++ b/tests/cfail/borrow.rs @@ -10,22 +10,24 @@ static R5: Resource = Resource::new(0); static R6: Resource = Resource::new(0); fn j1(prio: P2) { - R1.lock(&prio, |r1, c3| { - // CAN borrow a resource with ceiling C when the system ceiling SC > C - let r2 = R2.borrow(&prio, &c3); + let ceil = prio.as_ceiling(); - // CAN borrow a resource with ceiling C when the system ceiling SC == C - let r3 = R3.borrow(&prio, &c3); + rtfm::raise_to(ceil, &R1, |ceil| { + // CAN borrow a resource with ceiling C when the current ceiling SC > C + let r2 = R2.borrow(&prio, ceil); - // CAN'T borrow a resource with ceiling C when the system ceiling SC < C - let r4 = R4.borrow(&prio, &c3); + // CAN borrow a resource with ceiling C when the current ceiling SC == C + let r3 = R3.borrow(&prio, ceil); + + // CAN'T borrow a resource with ceiling C when the current ceiling SC < C + let r4 = R4.borrow(&prio, ceil); //~^ error // CAN'T borrow a resource with ceiling C < P (task priority) - let r5 = R5.borrow(&prio, &c3); + let r5 = R5.borrow(&prio, ceil); //~^ error // CAN borrow a resource with ceiling C == P (task priority) - let r6 = R6.borrow(&prio, &c3); + let r6 = R6.borrow(&prio, ceil); }); } -- cgit v1.2.3