Changeset b067d9b for tests/concurrent/examples/boundedBufferEXT.cfa

Timestamp:

Oct 29, 2019, 4:01:24 PM (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:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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 (moved) (moved from src/tests/concurrent/examples/boundedBufferEXT.c ) (6 diffs)

tests/concurrent/examples/boundedBufferEXT.cfa

@@ -1 +1 @@
 //
+// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
+// 
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
@@ -8 +10 @@
 // Created On       : Wed Apr 18 22:52:12 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  2 16:12:58 2018
-// Update Count     : 7
+// Last Modified On : Fri Jun 21 08:19:20 2019
+// Update Count     : 14
 //
 
-#include <stdlib>                                                                               // random
-#include <fstream>
-#include <kernel>
-#include <thread>
+#include <stdlib.hfa>                                                                   // random
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <thread.hfa>
 #include <unistd.h>                                                                             // getpid
 
@@ -50 +52 @@
 }
 
-const int Sentinel = -1;
+enum { Sentinel = -1 };
 
 thread Producer {
@@ -57 +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 );
@@ -73 +75 @@
 void main( Consumer & cons ) with( cons ) {
         sum = 0;
-        for ( ;; ) {
+        for () {
                 yield( random( 5 ) );
                 int item = remove( buffer );
@@ -97 +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];
         } // for
-        sout | "total:" | sum | endl;
+        sout | "total:" | sum;
 }
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa boundedBufferEXT.c" //
+// compile-command: "cfa boundedBufferEXT.cfa" //
 // End: //