Changeset 436c0de for src/libcfa/concurrency/coroutine

Timestamp:

Jun 18, 2017, 9:22:22 AM (8 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:

f1e80d8

Parents:

ade20d0 (diff), 42b0d73 (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

Conflicts:

src/InitTweak/GenInit.cc

File:

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

src/libcfa/concurrency/coroutine

@@ -71 +71 @@
 // Suspend implementation inlined for performance
 static inline void suspend() {
-      coroutine_desc * src = this_coroutine();          // optimization
+        coroutine_desc * src = this_coroutine();                // optimization
 
         assertf( src->last != 0,
@@ -91 +91 @@
         coroutine_desc * dst = get_coroutine(cor);
 
-      if( unlikely(!dst->stack.base) ) {
+        if( unlikely(!dst->stack.base) ) {
                 create_stack(&dst->stack, dst->stack.size);
                 CtxStart(cor, CtxInvokeCoroutine);
         }
 
-      // not resuming self ?
+        // not resuming self ?
         if ( src != dst ) {
                 assertf( dst->state != Halted ,
@@ -103 +103 @@
                         src->name, src, dst->name, dst );
 
-            // set last resumer
+                // set last resumer
                 dst->last = src;
         } // if
 
-      // always done for performance testing
+        // always done for performance testing
         CoroutineCtxSwitch( src, dst );
 }
@@ -114 +114 @@
         coroutine_desc * src = this_coroutine();                // optimization
 
-      // not resuming self ?
+        // not resuming self ?
         if ( src != dst ) {
                 assertf( dst->state != Halted ,
@@ -121 +121 @@
                         src->name, src, dst->name, dst );
 
-            // set last resumer
+                // set last resumer
                 dst->last = src;
         } // if
 
-      // always done for performance testing
+        // always done for performance testing
         CoroutineCtxSwitch( src, dst );
 }