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

File:

• src/tests/sched-int-wait.c (modified) (7 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 );
 }
@@ -62 +62 @@
 
         while( waiter_left != 0 ) {
-                unsigned action = rand48(4);
+            unsigned action = random( 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:
@@ -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 );
         }
 
@@ -127 +127 @@
 // Main
 int main(int argc, char* argv[]) {
-        rand48seed( time( NULL ) );
+        random_seed( time( NULL ) );
         waiter_left = 4;
         processor p[2];