Changeset ef6851a for src/libcfa/concurrency/coroutine.c

Timestamp:

Jul 12, 2017, 9:50:58 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

1a6e855

Parents:

8b47e50 (diff), acb89ed (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 plg2:software/cfa/cfa-cc

File:

• src/libcfa/concurrency/coroutine.c (modified) (5 diffs)

src/libcfa/concurrency/coroutine.c

@@ -32 +32 @@
 #include "invoke.h"
 
-extern thread_local processor * this_processor;
+extern volatile thread_local processor * this_processor;
 
 //-----------------------------------------------------------------------------
@@ -44 +44 @@
 // Coroutine ctors and dtors
 void ?{}(coStack_t* this) {
-        this->size              = 10240;        // size of stack
+        this->size              = 65000;        // size of stack
         this->storage   = NULL; // pointer to stack
         this->limit             = NULL; // stack grows towards stack limit
@@ -50 +50 @@
         this->context   = NULL; // address of cfa_context_t
         this->top               = NULL; // address of top of storage
-        this->userStack = false;        
+        this->userStack = false;
 }
 
@@ -106 +106 @@
 
         // set state of current coroutine to inactive
-        src->state = Inactive;
+        src->state = src->state == Halted ? Halted : Inactive;
 
         // set new coroutine that task is executing
-        this_processor->current_coroutine = dst;
+        this_coroutine = dst;
 
         // context switch to specified coroutine
+        assert( src->stack.context );
         CtxSwitch( src->stack.context, dst->stack.context );
-        // when CtxSwitch returns we are back in the src coroutine              
+        // when CtxSwitch returns we are back in the src coroutine
 
         // set state of new coroutine to active
@@ -131 +132 @@
                 this->size = libCeiling( storageSize, 16 );
                 // use malloc/memalign because "new" raises an exception for out-of-memory
-                
+
                 // assume malloc has 8 byte alignment so add 8 to allow rounding up to 16 byte alignment
                 LIB_DEBUG_DO( this->storage = memalign( pageSize, cxtSize + this->size + pageSize ) );