Changes in src/tests/datingService.c [6c7b1e7:4cedd9f]

File:

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

src/tests/datingService.c

@@ -1 @@
-//                               -*- Mode: C -*- 
-// 
+//                               -*- Mode: C -*-
+//
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// datingService.c -- 
-// 
+//
+// datingService.c --
+//
 // Author           : Peter A. Buhr
 // 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 : Mon Oct 30 17:58:41 2017
+// Update Count     : 14
+//
 
-#include <stdlib>                                                                               // random
+#include <stdlib>                                                                               // rand48
 #include <fstream>
 #include <kernel>
 #include <thread>
 #include <unistd.h>                                                                             // getpid
-
-bool empty( condition & c ) {
-        return c.blocked.head == NULL;
-}
 
 enum { NoOfPairs = 20 };
@@ -31 +27 @@
 
 unsigned int girl( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) {
-        if ( empty( ds.Boys[ccode] ) ) {
-                wait( &ds.Girls[ccode] );
+        if ( is_empty( ds.Boys[ccode] ) ) {
+                wait( ds.Girls[ccode] );
                 ds.GirlPhoneNo = PhoneNo;
         } else {
                 ds.GirlPhoneNo = PhoneNo;
-                signal_block( &ds.Boys[ccode] );
+                signal_block( ds.Boys[ccode] );
         } // if
         return ds.BoyPhoneNo;
@@ -42 +38 @@
 
 unsigned int boy( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) {
-        if ( empty( ds.Girls[ccode] ) ) {
-                wait( &ds.Boys[ccode] );
+        if ( is_empty( ds.Girls[ccode] ) ) {
+                wait( ds.Boys[ccode] );
                 ds.BoyPhoneNo = PhoneNo;
         } else {
                 ds.BoyPhoneNo = PhoneNo;
-                signal_block( &ds.Girls[ccode] );
+                signal_block( ds.Girls[ccode] );
         } // if
         return ds.GirlPhoneNo;
@@ -61 +57 @@
 
 void main( Girl & g ) {
-        yield( random( 100 ) );                                                         // don't all start at the same time
+        yield( rand48( 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;
@@ -79 +75 @@
 
 void main( Boy & b ) {
-        yield( random( 100 ) );                                                         // don't all start at the same time
+        yield( rand48( 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;
@@ -96 +92 @@
         Boy  *boys[NoOfPairs];
 
-        random_seed( getpid() );
+        rand48seed( getpid() );
 
         for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {