Changeset b58a5772 for src/libcfa

Timestamp:

Dec 8, 2016, 5:50:39 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:

164d036

Parents:

fda7e90

Message:

Removed workarounds the void ptr error (now fixed).
Renamed a few functions for consistency

Location:

src/libcfa/concurrency

Files:

• CtxSwitch-x86_64.S (modified) (1 diff)
• invoke.c (modified) (3 diffs)
• invoke.h (modified) (1 diff)
• threads.c (modified) (5 diffs)

src/libcfa/concurrency/CtxSwitch-x86_64.S ¶

@@ -79 +79 @@
 .text
         .align 2
-.globl  coInvokeStub
-coInvokeStub:
+.globl  CtxInvokeStub
+CtxInvokeStub:
         movq %rbx, %rdi 
         jmp *%r12

src/libcfa/concurrency/invoke.c ¶

@@ -15 +15 @@
 extern void __suspend__F___1(void);
 
-void invokeCoroutine(
+void CtxInvokeCoroutine(
       void (*main)(void *), 
       struct coroutine *(*get_coroutine)(void *), 
@@ -34 +34 @@
 
 
-void startCoroutine(
+void CtxStart(
       void (*main)(void *), 
       struct coroutine *(*get_coroutine)(void *), 
@@ -73 +73 @@
 
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->dummyReturn = NULL;
-      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = coInvokeStub;
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = CtxInvokeStub;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[0] = this;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = invoke;

src/libcfa/concurrency/invoke.h ¶

@@ -45 +45 @@
 
       // assembler routines that performs the context switch
-      extern void coInvokeStub( void );
+      extern void CtxInvokeStub( void );
       void CtxSwitch( void *from, void *to ) asm ("CtxSwitch");
 

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();