Changes in src/tests/sched-int-wait.c [19801aa:9737ffe]

File:

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

src/tests/sched-int-wait.c

@@ -4 +4 @@
 #include <stdlib>
 #include <thread>
-
-static const int N = 10_000;
 
 monitor global_t {};
@@ -15 +13 @@
 condition condAB, condAC, condBC, condABC;
 
-thread Signaler {};
+thread Signaler {
+        int signals[4];
+};
+
+void ?{}( Signaler * this ){
+        this->signals[0] = 0;
+        this->signals[1] = 0;
+        this->signals[2] = 0;
+        this->signals[3] = 0;
+}
+
 thread WaiterAB {};
 thread WaiterAC {};
@@ -21 +29 @@
 thread WaiterABC{};
 
-volatile int waiter_left;
+volatile bool done;
 
 //----------------------------------------------------------------------------------------------------
@@ -45 +53 @@
 void main( Signaler* this ) {
 
-        while( waiter_left != 0 ) {
-                unsigned action = (unsigned)rand48() % 4;
+        while( true ) {
+                int action = (unsigned)rand48() % 4;
+                bool finished = true;
+
+                for(int i = 0; i < 4; i++) {
+                        if( this->signals[action] < 10_000 ) {
+                                finished = false;
+                                break;
+                        }
+                        else {
+                                action = (action + 1) % 4;
+                        }
+                }
+
+                this->signals[action]++;
+                if( finished ) break;
+
+                //sout | action | this->signals[0] | this->signals[1] | this->signals[2] | this->signals[3] | endl;
+
                 switch( action ) {
                         case 0: 
@@ -64 +89 @@
                                 abort();
                 }
-                yield();
         }       
 }
@@ -71 +95 @@
 // Waiter ABC
 void main( WaiterABC* this ) {
-        for( int i = 0; i < N; i++ ) {
+        while( !done ) {
                 wait( &condABC, &globalA, &globalB, &globalC );
         }
-
-        __sync_fetch_and_sub_4( &waiter_left, 1);
 }
 
@@ -81 +103 @@
 // Waiter AB
 void main( WaiterAB* this ) {
-        for( int i = 0; i < N; i++ ) {
+        while( !done ) {
                 wait( &condAB , &globalA, &globalB );
         }
-
-        __sync_fetch_and_sub_4( &waiter_left, 1);
 }
 
@@ -91 +111 @@
 // Waiter AC
 void main( WaiterAC* this ) {
-        for( int i = 0; i < N; i++ ) {
+        while( !done ) {
                 wait( &condAC , &globalA, &globalC );
         }
-
-        __sync_fetch_and_sub_4( &waiter_left, 1);
 }
 
@@ -101 +119 @@
 // Waiter BC
 void main( WaiterBC* this ) {
-        for( int i = 0; i < N; i++ ) {
+        while( !done ) {
                 wait( &condBC , &globalB, &globalC );
         }
-
-        __sync_fetch_and_sub_4( &waiter_left, 1);
 }
 
@@ -111 +127 @@
 // Main
 int main(int argc, char* argv[]) {
-        waiter_left = 4;
+        done = false;
         processor p;
         {
-                Signaler  e;
+                WaiterABC a;
+                WaiterAB  b;
+                WaiterBC  c;
+                WaiterAC  d;
                 {
-                        WaiterABC a;
-                        WaiterAB  b;
-                        WaiterBC  c;
-                        WaiterAC  d;
+                        Signaler  e;
                 }
+                done = true;
+                signal( &condABC, &globalA, &globalB, &globalC );
+                signal( &condAB , &globalA, &globalB );
+                signal( &condBC , &globalB, &globalC );
+                signal( &condAC , &globalA, &globalC );
         }
 }