Changes in libcfa/src/concurrency/invoke.c [09f357ec:2026bb6]

File:

• libcfa/src/concurrency/invoke.c (modified) (6 diffs)

libcfa/src/concurrency/invoke.c

@@ -29 +29 @@
 // Called from the kernel when starting a coroutine or task so must switch back to user mode.
 
-extern void __leave_coroutine ( struct coroutine_desc * );
-extern struct coroutine_desc * __finish_coroutine(void);
-extern void __leave_thread_monitor();
+extern void __suspend_internal(void);
+extern void __leave_coroutine( struct coroutine_desc * );
+extern void __finish_creation( struct thread_desc * );
+extern void __leave_thread_monitor( struct thread_desc * this );
 extern void disable_interrupts() OPTIONAL_THREAD;
 extern void enable_interrupts( __cfaabi_dbg_ctx_param );
@@ -37 +38 @@
 void CtxInvokeCoroutine(
         void (*main)(void *),
+        struct coroutine_desc *(*get_coroutine)(void *),
         void *this
 ) {
-        // Finish setting up the coroutine by setting its state
-        struct coroutine_desc * cor = __finish_coroutine();
+        struct coroutine_desc* cor = get_coroutine( this );
 
-        // Call the main of the coroutine
+        if(cor->state == Primed) {
+                __suspend_internal();
+        }
+
+        cor->state = Active;
+
         main( this );
 
@@ -77 +83 @@
 
 void CtxInvokeThread(
+        void (*dtor)(void *),
         void (*main)(void *),
+        struct thread_desc *(*get_thread)(void *),
         void *this
 ) {
+        // Fetch the thread handle from the user defined thread structure
+        struct thread_desc* thrd = get_thread( this );
+
+        // First suspend, once the thread arrives here,
+        // the function pointer to main can be invalidated without risk
+        __finish_creation( thrd );
+
         // Officially start the thread by enabling preemption
         enable_interrupts( __cfaabi_dbg_ctx );
@@ -93 +108 @@
         // The order of these 4 operations is very important
         //Final suspend, should never return
-        __leave_thread_monitor();
+        __leave_thread_monitor( thrd );
         __cabi_abort( "Resumed dead thread" );
 }
 
+
 void CtxStart(
         void (*main)(void *),
-        struct coroutine_desc * cor,
+        struct coroutine_desc *(*get_coroutine)(void *),
         void *this,
         void (*invoke)(void *)
 ) {
+        struct coroutine_desc * cor = get_coroutine( this );
         struct __stack_t * stack = cor->stack.storage;
 
@@ -121 +138 @@
 
         fs->dummyReturn = NULL;
-        fs->argument[0] = main;     // argument to invoke
-        fs->argument[1] = this;     // argument to invoke
+        fs->argument[0] = this;     // argument to invoke
         fs->rturn = invoke;
 
@@ -140 +156 @@
         fs->dummyReturn = NULL;
         fs->rturn = CtxInvokeStub;
-        fs->fixedRegisters[0] = main;
-        fs->fixedRegisters[1] = this;
-        fs->fixedRegisters[2] = invoke;
+        fs->fixedRegisters[0] = this;
+        fs->fixedRegisters[1] = invoke;
 
 #elif defined( __ARM_ARCH )
-#error ARM needs to be upgrade to use to parameters like X86/X64 (A.K.A. : I broke this and do not know how to fix it)
+
         struct FakeStack {
                 float fpRegs[16];                       // floating point registers