Changeset b067d9b for tests/concurrent/examples/datingService.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/datingService.cfa (moved) (moved from src/tests/concurrent/examples/datingService.c ) (9 diffs)

tests/concurrent/examples/datingService.cfa

@@ -1 +1 @@
 //
+// Cforall Version 1.0.0 Copyright (C) 2017 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       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 27 09:05:18 2018
-// Update Count     : 26
+// Last Modified On : Fri Jun 21 11:32:34 2019
+// Update Count     : 38
 //
 
-#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
 
@@ -33 +35 @@
                 signal_block( Boys[ccode] );                                    // restart boy to set phone number
         } // if
+        sout | "Girl:" | PhoneNo | "is dating Boy at" | BoyPhoneNo | "with ccode" | ccode;
         return BoyPhoneNo;
 } // DatingService girl
@@ -44 +47 @@
                 signal_block( Girls[ccode] );                                   // restart girl to set phone number
         } // if
+        sout | " Boy:" | PhoneNo | "is dating Girl" | GirlPhoneNo | "with ccode" | ccode;
         return GirlPhoneNo;
 } // DatingService boy
@@ -58 +62 @@
         yield( random( 100 ) );                                                         // don't all start at the same time
         unsigned int partner = girl( TheExchange, id, ccode );
-        sout | "Girl:" | id | "is dating Boy at" | partner | "with ccode" | ccode | endl;
         girlck[id] = partner;
 } // Girl main
@@ -69 +72 @@
 
 thread Boy {
-        DatingService &TheExchange;
+        DatingService & TheExchange;
         unsigned int id, ccode;
 }; // Boy
@@ -76 +79 @@
         yield( random( 100 ) );                                                         // don't all start at the same time
         unsigned int partner = boy( TheExchange, id, ccode );
-        sout | " Boy:" | id | "is dating Girl" | partner | "with ccode" | ccode | endl;
         boyck[id] = partner;
 } // Boy main
@@ -93 +95 @@
         srandom( /*getpid()*/ 103 );
 
-        for ( unsigned int i = 0; i < CompCodes; i += 1 ) {
-                girls[i] = new( &TheExchange, i, i );
+        for ( i; (unsigned int)CompCodes ) {
+                girls[i] = new( &TheExchange, i, i );                   // TheExchange constructor needs unsigned int
                 boys[i]  = new( &TheExchange, i, CompCodes - ( i + 1 ) );
         } // for
 
-        for ( unsigned int i = 0; i < CompCodes; i += 1 ) {
+        for ( i; CompCodes ) {
                 delete( boys[i] );
                 delete( girls[i] );
         } // for
 
-        for ( unsigned int i = 0; i < CompCodes; i += 1 ) {
+        for ( i; CompCodes ) {
                 if ( girlck[ boyck[i] ] != boyck[ girlck[i] ] ) abort();
         } // for
@@ -110 +112 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa datingService.c" //
+// compile-command: "cfa datingService.cfa" //
 // End: //