Changeset 92538ab for tests/io

Timestamp:

Apr 10, 2022, 2:53:18 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

Location:

tests/io

Files:

• .expect/away_fair.txt (added)
• .expect/comp_fair.txt (added)
• away_fair.cfa (added)
• comp_fair.cfa (added)
• io-acquire.cfa (modified) (2 diffs)
• many_read.cfa (modified) (1 diff)

tests/io/io-acquire.cfa

@@ -10 +10 @@
 // Created On       : Mon Mar  1 18:40:09 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jan 14 09:13:18 2022
-// Update Count     : 74
+// Last Modified On : Sat Apr  9 15:22:03 2022
+// Update Count     : 76
 // 
 
@@ -17 +17 @@
 #include <thread.hfa>
 #include <mutex_stmt.hfa>
-
-Duration default_preemption() { return 0; }
 
 thread T {};

tests/io/many_read.cfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// many_read.cfa -- Make sure that multiple concurrent reads to mess up.
+// many_read.cfa -- Make sure that multiple concurrent reads don't mess up.
 //
 // Author           : Thierry Delisle