Changeset 5ebb2fbc for src/libcfa/concurrency/threads

Timestamp:

Jan 18, 2017, 12:47:15 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

e9e4e9ee

Parents:

f3b0a07 (diff), c49bf54 (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' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/libcfa/concurrency/threads (modified) (3 diffs)

src/libcfa/concurrency/threads

@@ -9 +9 @@
 //
 // Author           : Thierry Delisle
-// Created On       : Mon Nov 28 12:27:26 2016
+// Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Thierry Delisle
-// Last Modified On : Mon Nov 28 12:27:26 2016
+// Last Modified On : --
 // Update Count     : 0
 //
@@ -18 +18 @@
 #define THREADS_H
 
-#include "assert"       //
+#include "assert"
 #include "invoke.h"
+
+#include "coroutines"
 
 //-----------------------------------------------------------------------------
@@ -25 +27 @@
 // Anything that implements this trait can be resumed.
 // Anything that is resumed is a coroutine.
-trait is_coroutine(dtype T) {
+trait is_thread(dtype T /*| sized(T)*/) {
       void co_main(T* this);
-      coroutine* get_coroutine(T* this);
+      thread_h* get_thread(T* this);
+        /*void ?{}(T*);
+        void ^?{}(T*);*/
 };
+
+forall(otype T | is_thread(T) )
+static inline coroutine* get_coroutine(T* this) {
+        return &get_thread(this)->c;
+}
 
 //-----------------------------------------------------------------------------
 // Ctors and dtors
-void ?{}(coStack_t* this);
-void ?{}(coroutine* this);
-void ^?{}(coStack_t* this);
-void ^?{}(coroutine* this);
+void ?{}(thread_h* this);
+void ^?{}(thread_h* this);
 
 //-----------------------------------------------------------------------------
-// Public coroutine API
-static inline void suspend();
+// thread runner
+// Structure that actually start and stop threads
+forall(otype T | is_thread(T) )
+struct thread {
+        T handle;
+};
 
-forall(dtype T | is_coroutine(T))
-static inline void resume(T* cor);
+forall(otype T | is_thread(T) )
+void ?{}( thread(T)* this );
 
-forall(dtype T | is_coroutine(T))
-void prime(T* cor);
+forall(otype T, ttype P | is_thread(T) | { void ?{}(T*, P); } )
+void ?{}( thread(T)* this, P params );
+
+forall(otype T | is_thread(T) )
+void ^?{}( thread(T)* this );
 
 //-----------------------------------------------------------------------------
 // PRIVATE exposed because of inline
-
-// Start coroutine routines
-extern "C" {
-      forall(dtype T | is_coroutine(T))
-      void CtxInvokeCoroutine(T* this);
-
-      forall(dtype T | is_coroutine(T))
-      void CtxStart(T* this, void (*invoke)(T*));
-}
-
-// Get current coroutine
-extern coroutine* current_coroutine; //PRIVATE, never use directly
-static inline coroutine* this_coroutine(void) {
-        return current_coroutine;
-}
-
-// Private wrappers for context switch and stack creation
-extern void corCxtSw(coroutine* src, coroutine* dst);
-extern void create_stack( coStack_t* this, unsigned int storageSize );
-
-// Suspend implementation inlined for performance
-static inline void suspend() {
-      coroutine* src = this_coroutine();                // optimization
-
-        assertf( src->last != 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 );
-
-        corCxtSw( src, src->last );
-}
-
-// Resume implementation inlined for performance
-forall(dtype T | is_coroutine(T))
-static inline void resume(T* cor) {
-        coroutine* src = this_coroutine();              // optimization
-        coroutine* dst = get_coroutine(cor);
-
-      if( unlikely(!dst->stack.base) ) {
-                create_stack(&dst->stack, dst->stack.size);
-                CtxStart(cor, CtxInvokeCoroutine);
-        }
-
-      // not resuming self ?
-        if ( src != dst ) {
-                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 );
-
-            // set last resumer
-                dst->last = src;
-        } // if
-
-      // always done for performance testing
-        corCxtSw( src, dst );
-}
 
 #endif //THREADS_H