Changeset 28f3a19 for src/tests/concurrent/signal/disjoint.c

Timestamp:

Jun 27, 2018, 3:28:41 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

b21c77a

Parents:

0182bfa (diff), 63238a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into with_gc

File:

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

src/tests/concurrent/signal/disjoint.c

@@ -4 +4 @@
 #include <thread>
 #include <time>
+
+#include "long_tests.h"
 
 #ifndef PREEMPTION_RATE
@@ -13 +15 @@
 }
 
-#ifdef LONG_TEST
+#ifdef TEST_LONG
 static const unsigned long N = 300_000ul;
 #else
@@ -26 +28 @@
 monitor global_data_t;
 void ?{}( global_data_t & this );
-void ^?{} ( global_data_t & this );
+void ^?{} ( global_data_t & mutex this );
 
 monitor global_data_t {
@@ -42 +44 @@
 }
 
-void ^?{} ( global_data_t & this ) {}
+void ^?{} ( global_data_t & mutex this ) {}
 
 //------------------------------------------------------------------------------
@@ -67 +69 @@
         }
 
-        d.counter++;
+        #if !defined(TEST_FOREVER)
+                d.counter++;
+                if( (d.counter % 1000) == 0 ) sout | d.counter | endl;
+        #endif
 
-        if( (d.counter % 1000) == 0 ) sout | d.counter | endl;
-
-        return d.counter < N;
+        return TEST(d.counter < N);
 }
 
@@ -77 +80 @@
 
 void main( Waiter & this ) {
-        while( wait( mut, data ) ) { yield(); }
+        while( wait( mut, data ) ) { KICK_WATCHDOG; yield(); }
 }
 
@@ -94 +97 @@
 
         //This is technically a mutual exclusion violation but the mutex monitor protects us
-        bool running = data.counter < N && data.counter > 0;
+        bool running = TEST(data.counter < N) && data.counter > 0;
         if( data.state != SIGNAL && running ) {
                 sout | "ERROR Eager signal" | data.state | endl;