Changeset 9129a84

Timestamp:

Nov 28, 2016, 4:02:45 PM (7 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, resolv-new, with_gc

Children:

1f44196

Parents:

f773f67

Message:

Implemented suspend and resume for coroutines (CtxSw? does nothing)

Location:

src

Files:

• examples/coroutine.c (modified) (4 diffs)
• libcfa/assert (modified) (1 diff)
• libcfa/concurrency/threads (modified) (2 diffs)
• libcfa/concurrency/threads.c (modified) (1 diff)

src/examples/coroutine.c

@@ -12 +12 @@
 
 coroutine* this_coroutine(Fibonacci* this) {
-
+      return &this->c;
 }
 
@@ -19 +19 @@
       this->fn = 0;
       fn1 = this->fn;
-      suspend(this);            // return to last resume
+      suspend();                // return to last resume
 
       this->fn = 1;
       fn2 = fn1;
       fn1 = this->fn;
-      suspend(this);            // return to last resume
+      suspend();                // return to last resume
 
       for ( ;; ) {
@@ -30 +30 @@
             fn2 = fn1;
             fn1 = this->fn;
-            suspend(this);      // return to last resume
+            suspend();  // return to last resume
       }
 }
@@ -39 +39 @@
 }
 
-void main() {
+int main() {
       Fibonacci f1, f2;
       for ( int i = 1; i <= 10; i += 1 ) {
             sout | next(&f1) | ' ' | next(&f2) | endl;
       }
+
+      return 0;
 }

src/libcfa/assert

@@ -22 +22 @@
         #define __STRINGIFY__(str) #str
         #define __VSTRINGIFY__(str) __STRINGIFY__(str)
-        #define assertf(expr, fmt, ...) ((expr) ? static_cast<void>(0) : __assert_fail_f(__VSTRINGIFY__(expr), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, ## __VA_ARGS__ ))
+        #define assertf(expr, fmt, ...) ((expr) ? ((void)2) : __assert_fail_f(__VSTRINGIFY__(expr), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, ## __VA_ARGS__ ))
 
         void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) __attribute__((noreturn));

src/libcfa/concurrency/threads

@@ -17 +17 @@
 #define __THREADS_H__
 
+#include <stdbool.h>
 
 struct coroutine {
-      int blarg;
+      coroutine* last;
+      const char* name;
+      bool notHalted;
 };
+
+void ?{}(coroutine* this);
 
 trait coroutine_t(dtype T) {
@@ -26 +31 @@
 };
 
-forall(dtype T | coroutine_t(T))
-void suspend(T* cor);
+void suspend(void);
 
 forall(dtype T | coroutine_t(T))

src/libcfa/concurrency/threads.c

@@ -1 +1 @@
 #include "threads"
+#include "assert"
 
-forall(dtype T | coroutine_t(T))
-void suspend(T* cor) {
+#include <stddef.h>
 
+#include <fstream>
+ 
+static coroutine main_coroutine;
+static coroutine* current_coroutine = &main_coroutine;
+
+void ctxSwitchDirect(void* src, void* dst) {
+        current_coroutine = dst;
+}
+
+coroutine* this_coroutine() {
+        return current_coroutine;
+}
+
+void ?{}(coroutine* this)
+{
+        this->last = NULL;
+      this->name = "A Coroutine";
+      this->notHalted = true;
+}
+
+void suspend() {
+      coroutine* src = this_coroutine();                // optimization
+
+        assertf( src->last == (coroutine*)0, 
+                "Attempt to suspend coroutine %.256s (%p) that has never been resumed.\n"
+                "Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.",
+                src->name, src );
+        assertf( src->last->notHalted, 
+                "Attempt by coroutine %.256s (%p) to suspend back to terminated coroutine %.256s (%p).\n"
+                "Possible cause is terminated coroutine's main routine has already returned.",
+                src->name, src, src->last->name, src->last );
+
+        ctxSwitchDirect( src, src->last );
 }
 
 forall(dtype T | coroutine_t(T))
 void resume(T* cor) {
+        coroutine* src = this_coroutine();              // optimization
+        coroutine* dst = this_coroutine(cor);
 
+        if ( src != dst ) {                             // not resuming self ?
+                assertf( dst->notHalted , 
+                        "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
+                        "Possible cause is terminated coroutine's main routine has already returned.",
+                        src->name, src, dst->name, dst );
+                dst->last = src;                                        // set last resumer
+        } // if
+        ctxSwitchDirect( src, dst );                            // always done for performance testing
 }