Changeset 273ff10 for tests/concurrent/examples

Timestamp:

Jan 16, 2019, 6:13:39 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

ec7f50a

Parents:

def9d4e (diff), 3c54a71 (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 (modified) (4 diffs)

tests/concurrent/examples/datingService.cfa

@@ -33 +33 @@
                 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 +45 @@
                 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 +60 @@
         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;
         girlck[id] = partner;
 } // Girl main
@@ -76 +77 @@
         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;
         boyck[id] = partner;
 } // Boy main