Changeset 5e1adb5

Timestamp:

Dec 7, 2017, 1:11:45 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

1485c1a, 6ba16fa, 8da74119

Parents:

09687aa

Message:

use "with" clause

File:

• src/tests/concurrent/examples/datingService.c (modified) (6 diffs)

src/tests/concurrent/examples/datingService.c

@@ -1 @@
-//                               -*- Mode: C -*-
 //
 // The contents of this file are covered under the licence agreement in the
@@ -9 +8 @@
 // Created On       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec  5 23:06:40 2017
-// Update Count     : 18
+// Last Modified On : Wed Dec  6 12:19:19 2017
+// Update Count     : 21
 //
 
@@ -27 +26 @@
 
 unsigned int girl( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) with( ds ) {
-        if ( is_empty( Boys[ccode] ) ) {
-                wait( Girls[ccode] );
-                GirlPhoneNo = PhoneNo;
+        if ( is_empty( Boys[ccode] ) ) {                                        // no compatible boy ?
+                wait( Girls[ccode] );                                                   // wait for boy
+                GirlPhoneNo = PhoneNo;                                                  // make phone number available
         } else {
-                GirlPhoneNo = PhoneNo;
-                signal_block( Boys[ccode] );
+                GirlPhoneNo = PhoneNo;                                                  // make phone number available
+                signal_block( Boys[ccode] );                                    // restart boy to set phone number
         } // if
         return BoyPhoneNo;
@@ -38 +37 @@
 
 unsigned int boy( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) with( ds ) {
-        if ( is_empty( Girls[ccode] ) ) {
-                wait( Boys[ccode] );
-                BoyPhoneNo = PhoneNo;
+        if ( is_empty( Girls[ccode] ) ) {                                       // no compatible girl ?
+                wait( Boys[ccode] );                                                    // wait for girl
+                BoyPhoneNo = PhoneNo;                                                   // make phone number available
         } else {
-                BoyPhoneNo = PhoneNo;
-                signal_block( Girls[ccode] );
+                BoyPhoneNo = PhoneNo;                                                   // make phone number available
+                signal_block( Girls[ccode] );                                   // restart girl to set phone number
         } // if
         return GirlPhoneNo;
@@ -56 +55 @@
 }; // Girl
 
-void main( Girl & g ) {
+void main( Girl & g ) with( g ) {
         yield( random( 100 ) );                                                         // don't all start at the same time
-        unsigned int partner = girl( g.TheExchange, g.id, g.ccode );
-        sout | "Girl:" | g.id | "is dating Boy at" | partner | "with ccode" | g.ccode | endl;
-        girlck[g.id] = partner;
+        unsigned int partner = girl( TheExchange, id, ccode );
+        sout | "Girl:" | id | "is dating Boy at" | partner | "with ccode" | ccode | endl;
+        girlck[id] = partner;
 } // Girl main
 
@@ -74 +73 @@
 }; // Boy
 
-void main( Boy & b ) {
+void main( Boy & b ) with( b ) {
         yield( random( 100 ) );                                                         // don't all start at the same time
-        unsigned int partner = boy( b.TheExchange, b.id, b.ccode );
-        sout | " Boy:" | b.id | "is dating Girl" | partner | "with ccode" | b.ccode | endl;
-        boyck[b.id] = partner;
+        unsigned int partner = boy( TheExchange, id, ccode );
+        sout | " Boy:" | id | "is dating Girl" | partner | "with ccode" | ccode | endl;
+        boyck[id] = partner;
 } // Boy main