Changeset 28e58fd for src/tests/sched-int-wait.c

Timestamp:

Aug 25, 2017, 10:38:34 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

800d275

Parents:

af08051 (diff), 3eab308c (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:

• src/tests/sched-int-wait.c (modified) (7 diffs)

src/tests/sched-int-wait.c

@@ -33 +33 @@
 //----------------------------------------------------------------------------------------------------
 // Tools
-void signal( condition * cond, global_t * mutex a, global_t * mutex b ) {
+void signal( condition * cond, global_t & mutex a, global_t & mutex b ) {
         signal( cond );
 }
 
-void signal( condition * cond, global_t * mutex a, global_t * mutex b, global_t * mutex c ) {
+void signal( condition * cond, global_t & mutex a, global_t & mutex b, global_t & mutex c ) {
         signal( cond );
 }
 
-void wait( condition * cond, global_t * mutex a, global_t * mutex b ) {
+void wait( condition * cond, global_t & mutex a, global_t & mutex b ) {
         wait( cond );
 }
 
-void wait( condition * cond, global_t * mutex a, global_t * mutex b, global_t * mutex c ) {
+void wait( condition * cond, global_t & mutex a, global_t & mutex b, global_t & mutex c ) {
         wait( cond );
 }
@@ -51 +51 @@
 //----------------------------------------------------------------------------------------------------
 // Signaler
-void main( Signaler* this ) {
+void main( Signaler & this ) {
 
         while( waiter_left != 0 ) {
@@ -57 +57 @@
                 switch( action ) {
                         case 0:
-                                signal( &condABC, &globalA, &globalB, &globalC );
+                                signal( &condABC, globalA, globalB, globalC );
                                 break;
                         case 1:
-                                signal( &condAB , &globalA, &globalB );
+                                signal( &condAB , globalA, globalB );
                                 break;
                         case 2:
-                                signal( &condBC , &globalB, &globalC );
+                                signal( &condBC , globalB, globalC );
                                 break;
                         case 3:
-                                signal( &condAC , &globalA, &globalC );
+                                signal( &condAC , globalA, globalC );
                                 break;
                         default:
@@ -78 +78 @@
 //----------------------------------------------------------------------------------------------------
 // Waiter ABC
-void main( WaiterABC* this ) {
+void main( WaiterABC & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait( &condABC, &globalA, &globalB, &globalC );
+                wait( &condABC, globalA, globalB, globalC );
         }
 
@@ -88 +88 @@
 //----------------------------------------------------------------------------------------------------
 // Waiter AB
-void main( WaiterAB* this ) {
+void main( WaiterAB & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait( &condAB , &globalA, &globalB );
+                wait( &condAB , globalA, globalB );
         }
 
@@ -98 +98 @@
 //----------------------------------------------------------------------------------------------------
 // Waiter AC
-void main( WaiterAC* this ) {
+void main( WaiterAC & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait( &condAC , &globalA, &globalC );
+                wait( &condAC , globalA, globalC );
         }
 
@@ -108 +108 @@
 //----------------------------------------------------------------------------------------------------
 // Waiter BC
-void main( WaiterBC* this ) {
+void main( WaiterBC & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait( &condBC , &globalB, &globalC );
+                wait( &condBC , globalB, globalC );
         }