Changeset 1ed9cb63 for tests/concurrent

Timestamp:

Oct 27, 2021, 5:15:41 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

40a64f78

Parents:

8a039be (diff), c600df1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests/concurrent

Files:

• semaphore.cfa (modified) (2 diffs)
• sleep.cfa (modified) (3 diffs)

tests/concurrent/semaphore.cfa

@@ -2 +2 @@
 #include <locks.hfa>
 #include <thread.hfa>
+#include <mutex_stmt.hfa>
 
 enum { num_blockers = 17, num_unblockers = 13 };
@@ -28 +29 @@
                 thrash();
                 P(ben);
-                if(((thread&)this).seqable.next != 0p) sout | acquire |"Link not invalidated";
+                if(((thread&)this).seqable.next != 0p) mutex(sout) sout | "Link not invalidated";
                 thrash();
         }

tests/concurrent/sleep.cfa

@@ -1 +1 @@
 #include <fstream.hfa>
 #include <thread.hfa>
+#include <mutex_stmt.hfa>
 #include <time.hfa>
 
@@ -29 +30 @@
 
 int main() {
-        sout | acquire | "start";
+        mutex( sout ) sout | "start";
         {
                 slow_sleeper slow;
@@ -36 +37 @@
                 yield();
         }
-        sout | acquire | "done";
+        mutex( sout ) sout | "done";
 }