Changeset 7bdcac1 for src/tests/concurrent

Timestamp:

Jun 11, 2018, 10:16:04 AM (6 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, with_gc

Children:

3fc59bdb

Parents:

85b1deb

Message:

Added the option to make longrun tests run until failure

Location:

src/tests/concurrent

Files:

• coroutineYield.c (modified) (3 diffs)
• preempt.c (modified) (4 diffs)
• signal/block.c (modified) (3 diffs)
• signal/disjoint.c (modified) (5 diffs)
• signal/wait.c (modified) (6 diffs)

src/tests/concurrent/coroutineYield.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 = 600_000ul;
 #else
@@ -33 +35 @@
 int main(int argc, char* argv[]) {
         Coroutine c;
-        for(int i = 0; i < N; i++) {
+        for(int i = 0; TEST(i < N); i++) {
                 sout | "Thread 1" | endl;
                 resume(c);
                 sout | "Thread 2" | endl;
                 yield();
+                KICK_WATCHDOG;
         }
 }

src/tests/concurrent/preempt.c

@@ -2 +2 @@
 #include <thread>
 #include <time>
+
+#include "long_tests.h"
 
 #ifndef PREEMPTION_RATE
@@ -11 +13 @@
 }
 
-#ifdef LONG_TEST
+#ifdef TEST_LONG
 static const unsigned long N = 30_000ul;
 #else
@@ -30 +32 @@
 
 void main(worker_t & this) {
-        while(counter < N) {
+        while(TEST(counter < N)) {
                 __cfaabi_check_preemption();
                 if( (counter % 7) == this.value ) {
@@ -40 +42 @@
                 }
                 __cfaabi_check_preemption();
+                KICK_WATCHDOG;
         }
 }

src/tests/concurrent/signal/block.c

@@ -14 +14 @@
 #include <time>
 
+#include "long_tests.h"
+
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
@@ -22 +24 @@
 }
 
-#ifdef LONG_TEST
+#ifdef TEST_LONG
 static const unsigned long N = 150_000ul;
 #else
@@ -66 +68 @@
 thread Waiter {};
 void main( Waiter & this ) {
-        for( int i = 0; i < N; i++ ) {
+        for( int i = 0; TEST(i < N); i++ ) {
                 wait_op( globalA, globalB, i );
+                KICK_WATCHDOG;
         }
 }

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
@@ -71 +73 @@
         if( (d.counter % 1000) == 0 ) sout | d.counter | endl;
 
-        return d.counter < N;
+        return TEST(d.counter < N);
 }
 
@@ -77 +79 @@
 
 void main( Waiter & this ) {
-        while( wait( mut, data ) ) { yield(); }
+        while( wait( mut, data ) ) { KICK_WATCHDOG; yield(); }
 }
 
@@ -94 +96 @@
 
         //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;

src/tests/concurrent/signal/wait.c

@@ -12 +12 @@
 #include <time>
 
+#include "long_tests.h"
+
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
@@ -20 +22 @@
 }
 
-#ifdef LONG_TEST
+#ifdef TEST_LONG
 static const unsigned long N = 375_000ul;
 #else
@@ -90 +92 @@
 // Waiter ABC
 void main( WaiterABC & this ) {
-        for( int i = 0; i < N; i++ ) {
+        for( int i = 0; TEST(i < N); i++ ) {
                 wait( condABC, globalA, globalB, globalC );
+                KICK_WATCHDOG;
         }
 
@@ -100 +103 @@
 // Waiter AB
 void main( WaiterAB & this ) {
-        for( int i = 0; i < N; i++ ) {
+        for( int i = 0; TEST(i < N); i++ ) {
                 wait( condAB , globalA, globalB );
+                KICK_WATCHDOG;
         }
 
@@ -110 +114 @@
 // Waiter AC
 void main( WaiterAC & this ) {
-        for( int i = 0; i < N; i++ ) {
+        for( int i = 0; TEST(i < N); i++ ) {
                 wait( condAC , globalA, globalC );
+                KICK_WATCHDOG;
         }
 
@@ -120 +125 @@
 // Waiter BC
 void main( WaiterBC & this ) {
-        for( int i = 0; i < N; i++ ) {
+        for( int i = 0; TEST(i < N); i++ ) {
                 wait( condBC , globalB, globalC );
+                KICK_WATCHDOG;
         }