Changeset b9696a8 for tests/concurrent/coroutineThen.cfa

Timestamp:

May 1, 2019, 3:23:01 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

f019069

Parents:

8278abf

Message:

Improved test for suspend_then feature

File:

• tests/concurrent/coroutineThen.cfa (modified) (5 diffs)

tests/concurrent/coroutineThen.cfa

@@ -28 +28 @@
                 sout | text;
         }
+
+        static inline void print(Printer & mutex this, const char * const text, int i ) {
+                sout | text | i;
+        }
 #else
         static inline void print(Printer & this, const char * const text ) {}
+        static inline void print(Printer & this, const char * const text, int i ) {}
 #endif
 Printer printer;
@@ -38 +43 @@
 Coroutine * volatile the_cor = 0p;
 
-void store(Coroutine * volatile * target, Coroutine * value) {
-        long long int val = value;
-        volatile long long int * ptr = target;
-        __atomic_store(ptr, &val, __ATOMIC_SEQ_CST);
+void store(Coroutine & cor) {
+        __atomic_store_n(&the_cor, &cor, __ATOMIC_SEQ_CST);
 }
 
-Coroutine * exchange(Coroutine * volatile * target) {
-        long long int ret;
-        volatile long long int * ptr = target;
-        long long int val = 0;
-        ret = __atomic_exchange_n(ptr, &val, __ATOMIC_SEQ_CST);
-        assert(ret == 0 || *ptr == 0);
-        return (Coroutine *)ret;
+Coroutine * take(void) {
+        Coroutine * val = 0p;
+        Coroutine * ret = __atomic_exchange_n(&the_cor, val, __ATOMIC_SEQ_CST);
+        assert(!ret || !the_cor);
+        return ret;
 }
 
 void main(Coroutine& this) {
+        suspend();
         for(int i = 0; TEST(i < N); i++) {
 
-                print(printer, "Coroutine 1");
+                print(printer, "Coroutine 1", i);
                 void publish() {
                         assert(!the_cor);
-                        store( &the_cor, &this );
+                        store( this );
                 }
                 suspend_then(publish);
+                assert(!the_cor);
                 print(printer, "Coroutine 2");
                 KICK_WATCHDOG;
@@ -67 +70 @@
         }
         done = true;
+        suspend();
 }
 
@@ -75 +79 @@
                 yield();
 
-                mine = exchange( &the_cor );
+                mine = take();
                 if(!mine) continue;
 
@@ -88 +92 @@
         processor p[2];
         Coroutine c;
+        resume(c); // Prime the coroutine to avoid one of the threads being its starter
         the_cor = &c;
         {