Changeset c90db2d for tests/io

Timestamp:

Jan 14, 2022, 7:01:21 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a2a4566

Parents:

145dcd5 (diff), 9ee3f54 (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/io

Files:

• .expect/io-acquire-in.txt (added)
• .expect/io-acquire-out.txt (moved) (moved from tests/io/.expect/io-acquire-term-sync.txt)
• .in/io-acquire-in.txt (moved) (moved from tests/io/.in/io-acquire-term-sync.txt)
• io-acquire-in.cfa (moved) (moved from tests/io/io-acquire-term-sync.cfa) (3 diffs)
• io-acquire-no-io.cfa (modified) (2 diffs)
• io-acquire-out.cfa (added)
• io-acquire.cfa (modified) (2 diffs)

tests/io/io-acquire-in.cfa

@@ -10 +10 @@
 // Created On       : Mon Mar  1 18:40:09 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Oct  6 18:04:58 2021
-// Update Count     : 72
+// Last Modified On : Fri Jan 14 09:13:43 2022
+// Update Count     : 73
 // 
 
@@ -18 +18 @@
 #include <mutex_stmt.hfa>
 
-thread T {};
-void main( T & ) {
-        // output from parallel threads should not be scrambled
+Duration default_preemption() { return 0; }
 
-        for ( 100 ) {                                                                           // expression protection
-                mutex(sout) sout | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
-        }
-        mutex( sout ) {                                                                         // statement protection
-                for ( 100 ) {
-                        sout | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
-                }
-        }
-        {                                                                                                       // duplicate protection demonstrating recursive lock
-                ofstream & h1( ofstream & os ) {                                // helper
-                        mutex( os ) return os | 1 | 2 | 3 | 4;          // unnecessary mutex
-                }
-                ofstream & h2( ofstream & os ) {                                // helper
-                        mutex( os ) return os | 6 | 7 | 8 | 9;          // unnecessary mutex
-                }
-                mutex( sout ) {                                                                 // unnecessary mutex
-                        for ( 100 ) {
-                                mutex( sout ) {
-                                        sout | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
-                                        sout | h1 | 5 | h2;                                     // refactored code
-                                }
-                        }
-                }
-        }
-}
         // above output used as input to parallel threads 
 thread T2 {};
@@ -79 +52 @@
         processor p;
         {
-                T t[5];
-        }
-        {
                 T2 t[5];
         }
+        sout | "done";
 } 
 

tests/io/io-acquire-no-io.cfa

@@ -10 +10 @@
 // Created On       : Mon Mar  1 18:40:09 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Oct  6 18:04:58 2021
-// Update Count     : 72
+// Last Modified On : Fri Jan 14 09:13:54 2022
+// Update Count     : 73
 // 
 
@@ -17 +17 @@
 #include <thread.hfa>
 #include <mutex_stmt.hfa>
+
+Duration default_preemption() { return 0; }
 
 multiple_acquisition_lock soutLock, sinLock;

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 : Mon Jan 10 07:57:12 2022
-// Update Count     : 73
+// Last Modified On : Fri Jan 14 09:13:18 2022
+// Update Count     : 74
 // 
 
@@ -17 +17 @@
 #include <thread.hfa>
 #include <mutex_stmt.hfa>
+
+Duration default_preemption() { return 0; }
 
 thread T {};