Changeset c7816be

Timestamp:

Jun 24, 2020, 2:47:04 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8ae4165

Parents:

52769ba

Message:

fixed disjoint test

File:

• tests/concurrent/signal/disjoint.cfa (modified) (7 diffs)

tests/concurrent/signal/disjoint.cfa

@@ -21 +21 @@
 #endif
 
+// This tests checks what happens when someone barges in the midle of the release
+// of a bulk of monitors.
+
 enum state_t { WAIT, SIGNAL, BARGE };
 
 monitor global_t {};
-global_t mut;
 
 monitor global_data_t;
@@ -33 +35 @@
         int counter;
         state_t state;
-} data;
+};
+
+// Use a global struct because the order needs to match with Signaller thread
+struct {
+        global_t mut;
+        global_data_t data;
+} globals;
 
 condition cond;
@@ -40 +48 @@
 
 void ?{}( global_data_t & this ) {
-        this.counter == 0;
+        this.counter = 0;
         this.state = BARGE;
 }
@@ -59 +67 @@
 void main( Barger & this ) {
         while( !all_done ) {
-                barge( data );
+                barge( globals.data );
                 yield();
         }
@@ -86 +94 @@
 
 void main( Waiter & this ) {
-        while( wait( mut, data ) ) { KICK_WATCHDOG; yield(); }
+        while( wait( globals.mut, globals.data ) ) { KICK_WATCHDOG; yield(); }
 }
 
@@ -98 +106 @@
 
 void logic( global_t & mutex a ) {
-        signal( cond, a, data );
+        signal( cond, a, globals.data );
 
         yield( random( 10 ) );
 
         //This is technically a mutual exclusion violation but the mutex monitor protects us
-        bool running = TEST(data.counter < N) && data.counter > 0;
-        if( data.state != SIGNAL && running ) {
-                sout | "ERROR Eager signal" | data.state;
+        bool running = TEST(globals.data.counter < N) && globals.data.counter > 0;
+        if( globals.data.state != SIGNAL && running ) {
+                sout | "ERROR Eager signal" | globals.data.state;
         }
 }
@@ -116 +124 @@
 void main( Signaller & this ) {
         while( !all_done ) {
-                logic( mut );
+                logic( globals.mut );
                 yield();
         }