Changeset 6fa9e71 for src/tests/datingService.c

Timestamp:

Nov 8, 2017, 10:58:43 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

8e0147a

Parents:

d06c808 (diff), b9d0fb6 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/tests/datingService.c (modified) (5 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
@@ -11 +11 @@
 // Last Modified On : Mon Oct 30 23:02:11 2017
 // Update Count     : 15
-// 
+//
 
 #include <stdlib>                                                                               // random
@@ -18 +18 @@
 #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;