Changeset 54dd994 for tests/concurrent/examples/boundedBufferEXT.cfa

Timestamp:

Jun 24, 2019, 10:30:47 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

84917e2

Parents:

3c6e417 (diff), 9e0a360 (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

File:

• tests/concurrent/examples/boundedBufferEXT.cfa (modified) (4 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 Mar 22 13:41:33 2019
-// Update Count     : 12
+// Last Modified On : Fri Jun 21 08:19:20 2019
+// Update Count     : 14
 //
 
@@ -52 +52 @@
 }
 
-const int Sentinel = -1;
+enum { Sentinel = -1 };
 
 thread Producer {
@@ -59 +59 @@
 };
 void main( Producer & prod ) with( prod ) {
-        for ( int i = 1; i <= N; i += 1 ) {
+        for ( i; 1 ~= N ) {
                 yield( random( 5 ) );
                 insert( buffer, 1 );
@@ -99 +99 @@
         srandom( 1003 );
 
-        for ( i = 0; i < Cons; i += 1 ) {                                       // create consumers
+        for ( i; Cons ) {                                                                       // create consumers
                 cons[i] = new( &buffer, sums[i] );
         } // for
-        for ( i = 0; i < Prods; i += 1 ) {                                      // create producers
+        for ( i; Prods ) {                                                                      // create producers
                 prods[i] = new( &buffer, 100000 );
         } // for
 
-        for ( i = 0; i < Prods; i += 1 ) {                                      // wait for producers to finish
+        for ( i; Prods ) {                                                                      // wait for producers to finish
                 delete( prods[i] );
         } // for
-        for ( i = 0; i < Cons; i += 1 ) {                                       // generate sentinal values to stop consumers
+        for ( i; Cons ) {                                                                       // generate sentinal values to stop consumers
                 insert( buffer, Sentinel );
         } // for
         int sum = 0;
-        for ( i = 0; i < Cons; i += 1 ) {                                       // wait for consumers to finish
+        for ( i; Cons ) {                                                                       // wait for consumers to finish
                 delete( cons[i] );
                 sum += sums[i];