Changeset 3c06bba

Timestamp:

Apr 15, 2019, 4:06:40 PM (6 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

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

Children:

deca0f5

Parents:

5c1a531

Message:

Inlined coroutine context switch routine

Location:

libcfa/src/concurrency

Files:

• CtxSwitch-i386.S (modified) (2 diffs)
• CtxSwitch-x86_64.S (modified) (2 diffs)
• coroutine.cfa (modified) (1 diff)
• coroutine.hfa (modified) (1 diff)
• invoke.h (modified) (1 diff)

libcfa/src/concurrency/CtxSwitch-i386.S

@@ -41 +41 @@
 #define PC_OFFSET       ( 2 * PTR_BYTE )
 
-.text
+        .text
         .align 2
-.globl  CtxSwitch
+        .globl CtxSwitch
+        .type  CtxSwitch, @function
 CtxSwitch:
 
@@ -94 +95 @@
 
         ret
+        .size  CtxSwitch, .-CtxSwitch
 
 // Local Variables: //

libcfa/src/concurrency/CtxSwitch-x86_64.S

@@ -40 +40 @@
 #define FP_OFFSET       ( 1 * PTR_BYTE )
 
-.text
+        .text
         .align 2
-.globl  CtxSwitch
+        .globl CtxSwitch
+        .type  CtxSwitch, @function
 CtxSwitch:
 
@@ -86 +87 @@
 
         ret
+        .size  CtxSwitch, .-CtxSwitch
+
 
 //.text

libcfa/src/concurrency/coroutine.cfa

@@ -124 +124 @@
 }
 
-// Wrapper for co
-void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
-        // set state of current coroutine to inactive
-        src->state = src->state == Halted ? Halted : Inactive;
-
-        // set new coroutine that task is executing
-        TL_GET( this_thread )->curr_cor = dst;
-
-        // context switch to specified coroutine
-        verify( dst->context.SP );
-        CtxSwitch( &src->context, &dst->context );
-        // when CtxSwitch returns we are back in the src coroutine
-
-        // set state of new coroutine to active
-        src->state = Active;
-
-        if( unlikely(src->cancellation != NULL) ) {
-                _CtxCoroutine_Unwind(src->cancellation, src);
-        }
-}
-
 [void *, size_t] __stack_alloc( size_t storageSize ) {
         static const size_t stack_data_size = libCeiling( sizeof(__stack_t), 16 ); // minimum alignment

libcfa/src/concurrency/coroutine.hfa

@@ -64 +64 @@
       forall(dtype T | is_coroutine(T))
       void CtxStart(T * this, void ( *invoke)(T *));
+
+        extern void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct coroutine_desc *) __attribute__ ((__noreturn__));
+
+        extern void CtxSwitch( struct __stack_context_t * from, struct __stack_context_t * to ) asm ("CtxSwitch");
+        // void CtxStore ( void * this ) asm ("CtxStore");
+        // void CtxRet   ( void * dst  ) asm ("CtxRet");
 }
 
 // Private wrappers for context switch and stack creation
-extern void CoroutineCtxSwitch(coroutine_desc * src, coroutine_desc * dst);
+// Wrapper for co
+static inline void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
+        // set state of current coroutine to inactive
+        src->state = src->state == Halted ? Halted : Inactive;
+
+        // set new coroutine that task is executing
+        TL_GET( this_thread )->curr_cor = dst;
+
+        // context switch to specified coroutine
+        verify( dst->context.SP );
+        CtxSwitch( &src->context, &dst->context );
+        // when CtxSwitch returns we are back in the src coroutine
+
+        // set state of new coroutine to active
+        src->state = Active;
+
+        if( unlikely(src->cancellation != NULL) ) {
+                _CtxCoroutine_Unwind(src->cancellation, src);
+        }
+}
+
 extern void __stack_prepare   ( __stack_info_t * this, size_t size /* ignored if storage already allocated */);
 

libcfa/src/concurrency/invoke.h

@@ -260 +260 @@
         // assembler routines that performs the context switch
         extern void CtxInvokeStub( void );
-        void CtxSwitch( struct __stack_context_t * from, struct __stack_context_t * to ) asm ("CtxSwitch");
+        extern void CtxSwitch( struct __stack_context_t * from, struct __stack_context_t * to ) asm ("CtxSwitch");
         // void CtxStore ( void * this ) asm ("CtxStore");
         // void CtxRet   ( void * dst  ) asm ("CtxRet");