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/race-2.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'tests/cfail/race-2.rs') diff --git a/tests/cfail/race-2.rs b/tests/cfail/race-2.rs index 23d7dd4..7f3504d 100644 --- a/tests/cfail/race-2.rs +++ b/tests/cfail/race-2.rs @@ -6,17 +6,23 @@ static R1: Resource = Resource::new(0); static R2: Resource = Resource::new(0); fn j1(prio: P1) { - R1.lock(&prio, |r1, _| { + let ceil = prio.as_ceiling(); + + rtfm::raise_to(ceil, &R1, |ceil| { + let r1 = R1.borrow(&prio, ceil); + // Would preempt this critical section // rtfm::request(j2); }); } fn j2(prio: P3) { - R2.lock(&prio, |r2, c4| { + let ceil = prio.as_ceiling(); + + rtfm::raise_to(ceil, &R2, |ceil| { // OK C2 (R1's ceiling) <= C4 (system ceiling) // BAD C2 (R1's ceiling) < P3 (j2's priority) - let r1 = R1.borrow(&prio, &c4); + let r1 = R1.borrow(&prio, ceil); //~^ error }); } -- cgit v1.2.3