Changeset 1fbab5a for src/libcfa/concurrency/coroutine.c

Timestamp:

Mar 16, 2017, 4:50:08 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:

395fc37, 64ac636, ef42b143

Parents:

2f26687a (diff), d6d747d (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/coroutine.c (moved) (moved from src/libcfa/concurrency/coroutines.c ) (9 diffs)

src/libcfa/concurrency/coroutine.c

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// coroutines.c --
+// coroutine.c --
 //
 // Author           : Thierry Delisle
@@ -15 +15 @@
 //
 
-#include "coroutines"
+#include "coroutine"
 
 extern "C" {
@@ -32 +32 @@
 #include "invoke.h"
 
-extern processor * get_this_processor();
+extern thread_local processor * this_processor;
 
 //-----------------------------------------------------------------------------
@@ -60 +60 @@
 }
 
-void ?{}(coroutine* this) {
+void ?{}(coroutine_desc* this) {
         this{ "Anonymous Coroutine" };
 }
 
-void ?{}(coroutine* this, const char * name) {
+void ?{}(coroutine_desc* this, const char * name) {
         this->name = name;
         this->errno_ = 0;
@@ -72 +72 @@
 }
 
-void ?{}(coroutine* this, size_t size) {
+void ?{}(coroutine_desc* this, size_t size) {
         this{};
         (&this->stack){size};
@@ -88 +88 @@
 }
 
-void ^?{}(coroutine* this) {}
+void ^?{}(coroutine_desc* this) {}
 
 // Part of the Public API
@@ -94 +94 @@
 forall(dtype T | is_coroutine(T))
 void prime(T* cor) {
-        coroutine* this = get_coroutine(cor);
+        coroutine_desc* this = get_coroutine(cor);
         assert(this->state == Start);
 
@@ -102 +102 @@
 
 // Wrapper for co
-void CoroutineCtxSwitch(coroutine* src, coroutine* dst) {
+void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
         // THREAD_GETMEM( This )->disableInterrupts();
 
@@ -109 +109 @@
 
         // set new coroutine that task is executing
-        get_this_processor()->current_coroutine = dst;                  
+        this_processor->current_coroutine = dst;
 
         // context switch to specified coroutine