Changeset 63364d8 for libcfa/src/concurrency

Timestamp:

May 9, 2019, 4:47:28 PM (6 years ago)

Author:

Thierry Delisle <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:

b038fe4

Parents:

f019069

Message:

Removed suspend_then since I believe it cannot be made correct

Location:

libcfa/src/concurrency

Files:

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

libcfa/src/concurrency/CtxSwitch-x86_64.S

@@ -80 +80 @@
 
 //-----------------------------------------------------------------------------
-// Part of a 2 part context switch routine, use with CtxRet, stores the current context and then makes a function call
-        .text
-        .align 2
-        .globl CtxStore
-        .type  CtxStore, @function
-CtxStore:
-
-        // Save volatile registers on the stack.
-
-        pushq %r15
-        pushq %r14
-        pushq %r13
-        pushq %r12
-        pushq %rbx
-
-        // Save old context in the "from" area.
-
-        movq %rsp,SP_OFFSET(%rdi)
-        movq %rbp,FP_OFFSET(%rdi)
-
-        mfence
-
-        // Don't load a new context, directly jump to the desired function
-#if defined(PIC)
-        call __suspend_callback@plt
-#else
-        call __suspend_callback
-#endif
-        .size  CtxStore, .-CtxStore
-
-//-----------------------------------------------------------------------------
-// Part of a 2 part context switch routine, use with CtxStore, context switches to the desired target without saving the current context
-        .text
-        .align 2
-        .globl CtxRet
-        .type  CtxRet, @function
-CtxRet:
-        // Load new context from the "to" area.
-
-        movq SP_OFFSET(%rdi),%rsp
-        movq FP_OFFSET(%rdi),%rbp
-
-        // Load volatile registers from the stack.
-
-        popq %rbx
-        popq %r12
-        popq %r13
-        popq %r14
-        popq %r15
-
-        // Return to thread.
-
-        ret
-        .size  CtxRet, .-CtxRet
-
-
-//-----------------------------------------------------------------------------
 // Stub used to create new stacks which are ready to be context switched to
         .text

libcfa/src/concurrency/coroutine.cfa

@@ -205 +205 @@
                 CoroutineCtxSwitch( src, starter );
         }
-
-        __attribute__((noreturn)) void __suspend_callback( struct __stack_context_t *, fptr_t call ) {
-                call();
-
-                coroutine_desc * src = TL_GET( this_thread )->curr_cor;
-                // set state of current coroutine to inactive
-                src->state = src->state == Halted ? Halted : Inactive;
-
-                TL_GET( this_thread )->curr_cor = src->last;
-
-                // context switch to specified coroutine
-                assert( src->last->context.SP );
-                CtxRet( &src->last->context );
-
-                abort();
-        }
 }
 

libcfa/src/concurrency/coroutine.hfa

@@ -68 +68 @@
 
         extern void CtxSwitch( struct __stack_context_t * from, struct __stack_context_t * to ) asm ("CtxSwitch");
-        extern void CtxStore ( struct __stack_context_t * from, fptr_t callback ) asm ("CtxStore");
 }
 
@@ -171 +170 @@
 }
 
-__attribute__((noreturn)) void __suspend_callback(void *, fptr_t call);
-
-static inline void suspend_then(fptr_t call) {
-        // optimization : read TLS once and reuse it
-        // Safety note: this is preemption safe since if
-        // preemption occurs after this line, the pointer
-        // will also migrate which means this value will
-        // stay in syn with the TLS
-        coroutine_desc * src = TL_GET( this_thread )->curr_cor;
-
-        assertf( src->last != 0,
-                "Attempt to suspend coroutine \"%.256s\" (%p) that has never been resumed.\n"
-                "Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.",
-                src->name, src );
-        assertf( src->last->state != Halted,
-                "Attempt by coroutine \"%.256s\" (%p) to suspend back to terminated coroutine \"%.256s\" (%p).\n"
-                "Possible cause is terminated coroutine's main routine has already returned.",
-                src->name, src, src->last->name, src->last );
-
-        src->state = PreInactive;
-
-      // context switch to specified coroutine
-      assert( src->context.SP );
-
-      CtxStore( &src->context, call );
-        // when CtxStore 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);
-        }
-
-        return;
-}
-
 // Local Variables: //
 // mode: c //

libcfa/src/concurrency/invoke.h

@@ -93 +93 @@
         };
 
-        enum coroutine_state { Halted, Start, Inactive, Active, Primed, PreInactive };
+        enum coroutine_state { Halted, Start, Inactive, Active, Primed };
 
         struct coroutine_desc {