Changeset 212c2187 for libcfa/src/concurrency/invoke.h

Timestamp:

Apr 1, 2019, 2:04:14 PM (5 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:

2fabdc02

Parents:

b611fc3

Message:

Removed kernelTLS.this_coroutine which was redundant and some preleminary work for breaking into 2 step the context-switch

File:

• libcfa/src/concurrency/invoke.h (modified) (4 diffs)

libcfa/src/concurrency/invoke.h

@@ -50 +50 @@
 
                 extern thread_local struct KernelThreadData {
-                        struct coroutine_desc * volatile this_coroutine;
                         struct thread_desc    * volatile this_thread;
                         struct processor      * volatile this_processor;
@@ -61 +60 @@
                 } kernelTLS __attribute__ ((tls_model ( "initial-exec" )));
         }
-
-        static inline struct coroutine_desc * volatile active_coroutine() { return TL_GET( this_coroutine ); }
-        static inline struct thread_desc    * volatile active_thread   () { return TL_GET( this_thread    ); }
-        static inline struct processor      * volatile active_processor() { return TL_GET( this_processor ); } // UNSAFE
         #endif
 
@@ -170 +165 @@
                         struct thread_desc * prev;
                 } node;
-     };
-
-     #ifdef __cforall
-     extern "Cforall" {
+        };
+
+        #ifdef __cforall
+        extern "Cforall" {
+                static inline struct coroutine_desc * volatile active_coroutine() { return TL_GET( this_thread )->curr_cor; }
+                static inline struct thread_desc    * volatile active_thread   () { return TL_GET( this_thread    ); }
+                static inline struct processor      * volatile active_processor() { return TL_GET( this_processor ); } // UNSAFE
+
                 static inline thread_desc * & get_next( thread_desc & this ) {
                         return this.next;
@@ -232 +231 @@
         extern void CtxInvokeStub( void );
         void CtxSwitch( void * from, void * to ) asm ("CtxSwitch");
+        // void CtxStore ( void * this ) asm ("CtxStore");
+        // void CtxRet   ( void * dst  ) asm ("CtxRet");
 
         #if   defined( __i386 )