Changes in src/tests/concurrent/signal/disjoint.c [ef952d7:b9da9585]

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