Changeset b984d54

Timestamp:

May 25, 2021, 4:13:37 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c65b930

Parents:

7404cdc

Message:

removed semaphore usage and used a lock when checking if empty

File:

• tests/unified_locking/timeout_lock.cfa (modified) (2 diffs)

tests/unified_locking/timeout_lock.cfa

@@ -6 +6 @@
 #include "kernel.cfa"
 
-multiple_acquisition_lock m;
-condition_variable( multiple_acquisition_lock ) c_m;
-
-semaphore s; // used for barrier like behaviour
+multiple_acquisition_lock m, n;
+condition_variable( multiple_acquisition_lock ) c_m, c_n;
 
 const unsigned int NoOfTimes = 20;
 
-void block() {
-        if (s.count == 0) {
-                P(s);
+void block() { // used for barrier like behaviour
+        lock(n);
+        if (empty( c_n )) {
+                wait( c_n, n );
         } else {
-                V(s);
+                notify_one( c_n );
         }
+        unlock(n);
 }
 
@@ -80 +80 @@
 
         printf("Start Test 2: testing timeout vs signalling with varying timeout durations\n");
-        s{ 0 };
         {
                 T1 t1;