Changeset 4ee36bf0 for src/tests/sched-int-wait.c

Timestamp:

Nov 8, 2017, 2:50:35 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

049ead9

Parents:

136ccd7 (diff), e35f30a (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' into cleanup-dtors

File:

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

src/tests/sched-int-wait.c

@@ -41 +41 @@
 //----------------------------------------------------------------------------------------------------
 // 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 );
 }
@@ -65 +65 @@
                 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:
@@ -88 +88 @@
 void main( WaiterABC & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait( &condABC, globalA, globalB, globalC );
+                wait( condABC, globalA, globalB, globalC );
         }
 
@@ -98 +98 @@
 void main( WaiterAB & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait( &condAB , globalA, globalB );
+                wait( condAB , globalA, globalB );
         }
 
@@ -108 +108 @@
 void main( WaiterAC & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait( &condAC , globalA, globalC );
+                wait( condAC , globalA, globalC );
         }
 
@@ -118 +118 @@
 void main( WaiterBC & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait( &condBC , globalB, globalC );
+                wait( condBC , globalB, globalC );
         }