Changeset 6a490b2 for tests/concurrent/suspend_then.cfa

Timestamp:

May 11, 2020, 1:53:29 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:

504a7dc

Parents:

b7d6a36 (diff), a7b486b (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 relaxed_ready

File:

• tests/concurrent/suspend_then.cfa (moved) (moved from tests/concurrent/coroutineThen.cfa) (6 diffs)

tests/concurrent/suspend_then.cfa

@@ -1 +1 @@
 #include <fstream.hfa>
 #include <kernel.hfa>
-#include <monitor.hfa>
 #include <thread.hfa>
 #include <time.hfa>
@@ -10 +9 @@
 #include "long_tests.hfa"
 
-#ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10`ms
-#endif
-
 Duration default_preemption() {
-        return PREEMPTION_RATE;
+        return 0;
 }
 
@@ -26 +21 @@
 #if !defined(TEST_FOREVER)
         static inline void print(const char * const text ) {
-                write( STDERR_FILENO, text, strlen(text) );
+                write( STDOUT_FILENO, text, strlen(text) );
         }
 #else
@@ -32 +27 @@
 #endif
 
-coroutine Coroutine {};
+generator Coroutine { int i; };
 
 volatile bool done = false;
@@ -49 +44 @@
 
 void main(Coroutine& this) {
-        suspend();
-        for(int i = 0; TEST(i < N); i++) {
+        this.i = 0;
+        suspend;
+        for(;TEST(this.i < N); this.i++) {
 
-                print("C - Suspending");
-                void publish() {
-                        print("C - Publishing");
+                print("C - Suspending\n");
+                suspend{
+                        print("C - Publishing\n");
                         assert(!the_cor);
                         store( this );
                 }
-                suspend_then(publish);
                 assert(!the_cor);
-                print("Coroutine 2");
+                print("C - Back\n");
                 KICK_WATCHDOG;
                 yield();
         }
         done = true;
-        suspend();
+        suspend;
 }
 
@@ -77 +72 @@
                 if(!mine) continue;
 
-                print("T - took");
+                print("T - took\n");
                 resume(*mine);
-                print("T - back");
         }
 }