Changeset 28564382 for libcfa/src/concurrency

Timestamp:

Jun 24, 2019, 6:05:10 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

08065aa4

Parents:

64dc36e (diff), 3e2f5e3 (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:software/cfa/cfa-cc

Location:

libcfa/src/concurrency

Files:

• coroutine.cfa (modified) (1 diff)
• invoke.h (modified) (1 diff)

libcfa/src/concurrency/coroutine.cfa

@@ -98 +98 @@
 
 void ^?{}(coroutine_desc& this) {
-        if(this.state != Halted && this.state != Start) {
+        if(this.state != Halted && this.state != Start && this.state != Primed) {
                 coroutine_desc * src = TL_GET( this_thread )->curr_cor;
                 coroutine_desc * dst = &this;

libcfa/src/concurrency/invoke.h

@@ -46 +46 @@
         #ifdef __cforall
         extern "Cforall" {
-                static inline struct thread_desc             *& get_next( struct thread_desc             & this );
-                static inline struct __condition_criterion_t *& get_next( struct __condition_criterion_t & this );
-
                 extern thread_local struct KernelThreadData {
                         struct thread_desc    * volatile this_thread;