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

Timestamp:

Feb 12, 2018, 1:33:45 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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:

ff2d1139

Parents:

48786bc8 (diff), cfe2f0a (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

File:

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

src/libcfa/concurrency/coroutine.c

@@ -99 +99 @@
 // Wrapper for co
 void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
-        // THREAD_GETMEM( This )->disableInterrupts();
+        disable_interrupts();
 
         // set state of current coroutine to inactive
@@ -115 +115 @@
         src->state = Active;
 
-        // THREAD_GETMEM( This )->enableInterrupts();
+        enable_interrupts( __cfaabi_dbg_ctx );
 } //ctxSwitchDirect