Changes in src/tests/concurrent/examples/datingService.c [948887f:971d9f2]

File:

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

src/tests/concurrent/examples/datingService.c

@@ -9 +9 @@
 // Created On       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct 30 23:02:11 2017
-// Update Count     : 15
+// Last Modified On : Tue Dec  5 23:06:40 2017
+// Update Count     : 18
 //
 
@@ -26 +26 @@
 }; // DatingService
 
-unsigned int girl( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) {
-        if ( is_empty( ds.Boys[ccode] ) ) {
-                wait( ds.Girls[ccode] );
-                ds.GirlPhoneNo = PhoneNo;
+unsigned int girl( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) with( ds ) {
+        if ( is_empty( Boys[ccode] ) ) {
+                wait( Girls[ccode] );
+                GirlPhoneNo = PhoneNo;
         } else {
-                ds.GirlPhoneNo = PhoneNo;
-                signal_block( ds.Boys[ccode] );
+                GirlPhoneNo = PhoneNo;
+                signal_block( Boys[ccode] );
         } // if
-        return ds.BoyPhoneNo;
+        return BoyPhoneNo;
 } // DatingService girl
 
-unsigned int boy( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) {
-        if ( is_empty( ds.Girls[ccode] ) ) {
-                wait( ds.Boys[ccode] );
-                ds.BoyPhoneNo = PhoneNo;
+unsigned int boy( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) with( ds ) {
+        if ( is_empty( Girls[ccode] ) ) {
+                wait( Boys[ccode] );
+                BoyPhoneNo = PhoneNo;
         } else {
-                ds.BoyPhoneNo = PhoneNo;
-                signal_block( ds.Girls[ccode] );
+                BoyPhoneNo = PhoneNo;
+                signal_block( Girls[ccode] );
         } // if
-        return ds.GirlPhoneNo;
+        return GirlPhoneNo;
 } // DatingService boy
 
@@ -59 +59 @@
         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;
+        sout | "Girl:" | g.id | "is dating Boy at" | partner | "with ccode" | g.ccode | endl;
         girlck[g.id] = partner;
 } // Girl main
@@ -77 +77 @@
         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;
+        sout | " Boy:" | b.id | "is dating Girl" | partner | "with ccode" | b.ccode | endl;
         boyck[b.id] = partner;
 } // Boy main
@@ -92 +92 @@
         Boy  *boys[NoOfPairs];
 
-        random_seed( getpid() );
+        random_seed( /*getpid()*/ 103 );
 
         for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {