Changeset 2ed94a9 for tests/concurrent

Timestamp:

Feb 8, 2023, 2:27:55 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

b110bcc

Parents:

997185e (diff), ccb29b4 (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:

• actors/.expect/dynamic.txt (added)
• actors/.expect/executor.txt (added)
• actors/.expect/matrix.txt (added)
• actors/.expect/pingpong.txt (added)
• actors/.expect/static.txt (added)
• actors/.expect/types.txt (added)
• actors/dynamic.cfa (added)
• actors/executor.cfa (added)
• actors/matrix.cfa (added)
• actors/pingpong.cfa (added)
• actors/static.cfa (added)
• actors/types.cfa (added)
• channels/parallel_harness.hfa (modified) (2 diffs)

tests/concurrent/channels/parallel_harness.hfa

@@ -2 +2 @@
 #include <fstream.hfa>
 #include <stdio.h>
-#include <string.h>
 #include <channel.hfa>
 #include <thread.hfa>
 #include <time.hfa>
-#include <stats.hfa>
 
 // user defines this
@@ -130 +128 @@
     }
 
-    sleep(1`s);
+    sleep(10`s);
     prod_done = true;