Changeset f019069 for libcfa/src/concurrency

Timestamp:

May 6, 2019, 10:09:02 AM (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:

63364d8

Parents:

b9696a8

Message:

Some more work on suspend_then

Location:

libcfa/src/concurrency

Files:

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

libcfa/src/concurrency/CtxSwitch-x86_64.S

@@ -100 +100 @@
         movq %rbp,FP_OFFSET(%rdi)
 
+        mfence
+
         // Don't load a new context, directly jump to the desired function
-
-        jmp *%rsi
+#if defined(PIC)
+        call __suspend_callback@plt
+#else
+        call __suspend_callback
+#endif
         .size  CtxStore, .-CtxStore
 

libcfa/src/concurrency/coroutine.cfa

@@ -40 +40 @@
                 abort();
         }
+
+        extern void CtxRet( struct __stack_context_t * to ) asm ("CtxRet") __attribute__ ((__noreturn__));
 }
 
@@ -203 +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, __attribute__((noreturn)) void (*__callback)(void) ) asm ("CtxStore");
-        extern void CtxRet   ( struct __stack_context_t * to ) asm ("CtxRet") __attribute__ ((__noreturn__));
+        extern void CtxStore ( struct __stack_context_t * from, fptr_t callback ) asm ("CtxStore");
 }
 
@@ -172 +171 @@
 }
 
+__attribute__((noreturn)) void __suspend_callback(void *, fptr_t call);
+
 static inline void suspend_then(fptr_t call) {
         // optimization : read TLS once and reuse it
@@ -194 +195 @@
       assert( src->context.SP );
 
-        __attribute__((noreturn)) void __suspend_callback(void) {
-                call();
-
-                // 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();
-        }
-      CtxStore( &src->context, __suspend_callback );
+      CtxStore( &src->context, call );
         // when CtxStore returns we are back in the src coroutine
 
@@ -220 +207 @@
         return;
 }
-
-// static inline void suspend_return(void) {
-//      // 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 );
-
-//      // Safety note : Preemption must be disabled here since kernelTLS.this_coroutine must always be up to date
-//       verify( TL_GET( preemption_state.enabled ) || TL_GET( this_processor )->do_terminate );
-//       disable_interrupts();
-
-//       // set state of current coroutine to inactive
-//       src->state = src->state == Halted ? Halted : Inactive;
-
-//       // set new coroutine that task is executing
-//       kernelTLS.this_coroutine = dst;
-
-//       // context switch to specified coroutine
-//       assert( src->stack.context );
-//      CtxRet( src->stack.context );
-
-//      abort();
-// }
 
 // Local Variables: //