Changeset 19801aa

Timestamp:

May 9, 2017, 4:24:55 PM (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:

66ef082

Parents:

f408e1a

Message:

Waiting test for monitor is more robust

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