Changeset cca568e for tests/concurrent/examples

Timestamp:

Jan 17, 2020, 3:01:27 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

9e63a2b

Parents:

4a063df

Message:

change all example waitfor statements from comma separate to colon

Location:

tests/concurrent/examples

Files:

• boundedBufferEXT.cfa (modified) (3 diffs)
• boundedBufferTHREAD.cfa (modified) (2 diffs)
• gortn.cfa (modified) (2 diffs)

tests/concurrent/examples/boundedBufferEXT.cfa

@@ -10 +10 @@
 // Created On       : Wed Apr 18 22:52:12 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 21 08:19:20 2019
-// Update Count     : 14
+// Last Modified On : Thu Jan 16 22:36:34 2020
+// Update Count     : 15
 //
 
@@ -37 +37 @@
 
         void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) {
-                if ( count == BufferSize ) waitfor( remove, buffer );
+                if ( count == BufferSize ) waitfor( remove : buffer );
                 elements[back] = elem;
                 back = ( back + 1 ) % BufferSize;
@@ -44 +44 @@
 
         T remove( Buffer(T) & mutex buffer ) with( buffer ) {
-                if ( count == 0 ) waitfor( insert, buffer );
+                if ( count == 0 ) waitfor( insert : buffer );
                 T elem = elements[front];
                 front = ( front + 1 ) % BufferSize;

tests/concurrent/examples/boundedBufferTHREAD.cfa

@@ -10 +10 @@
 // Created On       : Wed Apr 18 22:52:12 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 21 11:50:12 2019
-// Update Count     : 24
+// Last Modified On : Thu Jan 16 23:09:43 2020
+// Update Count     : 25
 //
 
@@ -44 +44 @@
         void main( Buffer & buffer ) with( buffer ) {
                 for () {
-                        waitfor( ^?{}, buffer ) {
+                        waitfor( ^?{} : buffer ) {
                                 break;
-                        } or when ( count != 20 ) waitfor( insert, buffer ) {
+                        } or when ( count != 20 ) waitfor( insert : buffer ) {
                                 back = (back + 1) % 20;
                                 count += 1;
-                        } or when ( count != 0 ) waitfor( remove, buffer ) {
+                        } or when ( count != 0 ) waitfor( remove : buffer ) {
                                 front = (front + 1) % 20;
                                 count -= 1;

tests/concurrent/examples/gortn.cfa

@@ -10 +10 @@
 // Created On       : Wed Feb 20 08:02:37 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 21 08:25:03 2019
-// Update Count     : 4
+// Last Modified On : Thu Jan 16 22:43:40 2020
+// Update Count     : 5
 // 
 
@@ -26 +26 @@
 void main( GoRtn & gortn ) with( gortn ) {
         for () {
-                waitfor( mem1, gortn ) sout | i;
-                or waitfor( mem2, gortn ) sout | f;
-                or waitfor( mem3, gortn ) sout | m.i | m.j;
-                or waitfor( ^?{}, gortn ) break;
+                waitfor( mem1 : gortn ) sout | i;
+                or waitfor( mem2 : gortn ) sout | f;
+                or waitfor( mem3 : gortn ) sout | m.i | m.j;
+                or waitfor( ^?{} : gortn ) break;
         }
 }