Changeset 28f3a19 for src/tests/concurrent/coroutineYield.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/coroutineYield.c (modified) (4 diffs)

src/tests/concurrent/coroutineYield.c

@@ -4 +4 @@
 #include <thread>
 #include <time>
+
+#define __kick_rate 150000ul
+#include "long_tests.h"
 
 #ifndef PREEMPTION_RATE
@@ -13 +16 @@
 }
 
-#ifdef LONG_TEST
+#ifdef TEST_LONG
 static const unsigned long N = 600_000ul;
 #else
@@ -23 +26 @@
 void main(Coroutine& this) {
         while(true) {
-                sout | "Coroutine 1" | endl;
+                #if !defined(TEST_FOREVER)
+                        sout | "Coroutine 1" | endl;
+                #endif
                 yield();
-                sout | "Coroutine 2" | endl;
+                #if !defined(TEST_FOREVER)
+                        sout | "Coroutine 2" | endl;
+                #endif
                 suspend();
         }
@@ -33 +40 @@
 int main(int argc, char* argv[]) {
         Coroutine c;
-        for(int i = 0; i < N; i++) {
-                sout | "Thread 1" | endl;
+        for(int i = 0; TEST(i < N); i++) {
+                #if !defined(TEST_FOREVER)
+                        sout | "Thread 1" | endl;
+                #endif
                 resume(c);
-                sout | "Thread 2" | endl;
+                #if !defined(TEST_FOREVER)
+                        sout | "Thread 2" | endl;
+                #endif
                 yield();
+                KICK_WATCHDOG;
         }
 }