Changes in src/tests/sched-int-wait.c [303406a:4cedd9f]

File:

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

src/tests/sched-int-wait.c

@@ +1 @@
+//---------------------------------------------------------
+// Multi wait test
+// Ensures that no deadlock from waiting/signalling conditions
+//---------------------------------------------------------
+
+
 #include <fstream>
 #include <kernel>
@@ -35 +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 );
 }
@@ -53 +59 @@
 //----------------------------------------------------------------------------------------------------
 // Signaler
-void main( Signaler* this ) {
+void main( Signaler & this ) {
 
         while( waiter_left != 0 ) {
-                unsigned action = (unsigned)rand48() % 4;
+                unsigned action = rand48(4);
                 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:
@@ -80 +86 @@
 //----------------------------------------------------------------------------------------------------
 // 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 );
         }
 
@@ -90 +96 @@
 //----------------------------------------------------------------------------------------------------
 // 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 );
         }
 
@@ -100 +106 @@
 //----------------------------------------------------------------------------------------------------
 // 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 );
         }
 
@@ -110 +116 @@
 //----------------------------------------------------------------------------------------------------
 // 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 );
         }