Changeset 164d036 for src/libcfa/concurrency/threads.c

Timestamp:

Dec 8, 2016, 5:53:25 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

6a16806

Parents:

9def87a (diff), b58a5772 (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/threads.c (modified) (5 diffs)

src/libcfa/concurrency/threads.c

@@ -44 +44 @@
 }
 
-void ctxSwitchDirect(coroutine* src, coroutine* dst);
+void corCxtSw(coroutine* src, coroutine* dst);
 void create_stack( coStack_t* this, unsigned int storageSize ); // used by all constructors
 
 extern "C" {
       forall(dtype T | is_coroutine(T))
-      void invokeCoroutine(T* this);
+      void CtxInvokeCoroutine(T* this);
 
       forall(dtype T | is_coroutine(T))
-      void startCoroutine(T* this, void (*invoke)(T*));
+      void CtxStart(T* this, void (*invoke)(T*));
 }
 
@@ -100 +100 @@
                 src->name, src, src->last->name, src->last );
 
-        ctxSwitchDirect( src, src->last );
+        corCxtSw( src, src->last );
 }
 
@@ -108 +108 @@
         coroutine* dst = get_coroutine(cor);
 
-        if( ((intptr_t)dst->stack.base) == 0 ) {
+        if( dst->stack.base == NULL ) {
                 create_stack(&dst->stack, dst->stack.size);
-                startCoroutine(cor, invokeCoroutine);
+                CtxStart(cor, CtxInvokeCoroutine);
         }
 
@@ -120 +120 @@
                 dst->last = src;                                        // set last resumer
         } // if
-        ctxSwitchDirect( src, dst );                            // always done for performance testing
+        corCxtSw( src, dst );                           // always done for performance testing
 }
 
@@ -132 +132 @@
 }
 
-void ctxSwitchDirect(coroutine* src, coroutine* dst) {
+void corCxtSw(coroutine* src, coroutine* dst) {
         // THREAD_GETMEM( This )->disableInterrupts();