Changeset dfa4360

Timestamp:

Mar 5, 2020, 5:50:29 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

9306559f

Parents:

427854b

Message:

Added several tests for generators

Location:

tests

Files:

• concurrent/.expect/suspend_then.txt (added)
• concurrent/suspend_then.cfa (moved) (moved from tests/concurrent/coroutineThen.cfa) (6 diffs)
• coroutine/suspend_then.cfa (modified) (1 diff)
• errors/suspend.cfa (added)
• generator/.expect/fmtLines.txt (added)
• generator/.expect/suspend_then.txt (added)
• generator/.in/fmtLines.txt (added)
• generator/fmtLines.cfa (added)
• generator/suspend_then.cfa (added)

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) {
+        this.i = 0;
         suspend;
-        for(int i = 0; TEST(i < N); i++) {
+        for(;TEST(this.i < N); this.i++) {
 
-                print("C - Suspending");
+                print("C - Suspending\n");
                 suspend{
-                        print("C - Publishing");
+                        print("C - Publishing\n");
                         assert(!the_cor);
                         store( this );
                 }
                 assert(!the_cor);
-                print("Coroutine 2");
+                print("C - Back\n");
                 KICK_WATCHDOG;
                 yield();
@@ -76 +72 @@
                 if(!mine) continue;
 
-                print("T - took");
+                print("T - took\n");
                 resume(*mine);
-                print("T - back");
         }
 }

tests/coroutine/suspend_then.cfa ¶

@@ -15 +15 @@
 
 #include <fstream.hfa>
-#include <coroutine.hfa>
 
-void then() {
-
-}
-
-coroutine Fibonacci { int fn; };                                                // used for communication
+generator Fibonacci {
+        int fn;                                                                         // used for communication
+        int fn1, fn2;                                                           // retained between resumes
+};
 
 void main( Fibonacci & fib ) with( fib ) {                              // called on first resume
-        int fn1, fn2;                                                           // retained between resumes
         fn = 0;  fn1 = fn;                                                      // 1st case
         suspend { sout | "Then!"; }                                             // restart last resume