Changeset 22f94a4 for libcfa/src/concurrency/invoke.h

Timestamp:

Aug 11, 2020, 4:40:15 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

0d070ca

Parents:

07d867b (diff), 129674b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into new-ast

File:

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

libcfa/src/concurrency/invoke.h

@@ -17 +17 @@
 #include "bits/defs.hfa"
 #include "bits/locks.hfa"
+#include "kernel/fwd.hfa"
 
 #ifdef __cforall
@@ -25 +26 @@
 #ifndef _INVOKE_H_
 #define _INVOKE_H_
-
-#ifdef __ARM_ARCH
-        // function prototypes are only really used by these macros on ARM
-        void disable_global_interrupts();
-        void enable_global_interrupts();
-
-        #define TL_GET( member ) ( { __typeof__( kernelTLS.member ) target; \
-                disable_global_interrupts(); \
-                target = kernelTLS.member; \
-                enable_global_interrupts(); \
-                target; } )
-        #define TL_SET( member, value ) disable_global_interrupts(); \
-                kernelTLS.member = value; \
-                enable_global_interrupts();
-#else
-        #define TL_GET( member ) kernelTLS.member
-        #define TL_SET( member, value ) kernelTLS.member = value;
-#endif
-
-        #ifdef __cforall
-        extern "Cforall" {
-                extern __attribute__((aligned(128))) thread_local struct KernelThreadData {
-                        struct $thread    * volatile this_thread;
-                        struct processor      * volatile this_processor;
-
-                        struct {
-                                volatile unsigned short disable_count;
-                                volatile bool enabled;
-                                volatile bool in_progress;
-                        } preemption_state;
-
-                        uint32_t rand_seed;
-                } kernelTLS __attribute__ ((tls_model ( "initial-exec" )));
-        }
-        #endif
 
         struct __stack_context_t {
@@ -92 +58 @@
         };
 
-        enum coroutine_state { Halted, Start, Primed, Blocked, Ready, Active, Rerun };
-        enum __Preemption_Reason { __NO_PREEMPTION, __ALARM_PREEMPTION, __POLL_PREEMPTION, __MANUAL_PREEMPTION };
+        enum __Coroutine_State { Halted, Start, Primed, Blocked, Ready, Active };
 
         struct $coroutine {
@@ -106 +71 @@
 
                 // current execution status for coroutine
-                enum coroutine_state state;
+                enum __Coroutine_State state;
 
                 // first coroutine to resume this one
@@ -161 +126 @@
         };
 
+        // Link lists fields
+        // instrusive link field for threads
+        struct __thread_desc_link {
+                struct $thread * next;
+                struct $thread * prev;
+                volatile unsigned long long ts;
+                int preferred;
+        };
+
         struct $thread {
                 // Core threading fields
@@ -167 +141 @@
 
                 // current execution status for coroutine
-                volatile int state;
-                enum __Preemption_Reason preempted;
+                volatile int ticket;
+                enum __Coroutine_State state:8;
+                enum __Preemption_Reason preempted:8;
 
                 //SKULLDUGGERY errno is not save in the thread data structure because returnToKernel appears to be the only function to require saving and restoring it
+
+                // pointer to the cluster on which the thread is running
+                struct cluster * curr_cluster;
+
+                // Link lists fields
+                // instrusive link field for threads
+                struct __thread_desc_link link;
 
                 // coroutine body used to store context
@@ -184 +166 @@
                 struct $monitor *  self_mon_p;
 
-                // pointer to the cluster on which the thread is running
-                struct cluster * curr_cluster;
-
                 // monitors currently held by this thread
                 struct __monitor_group_t monitors;
-
-                // Link lists fields
-                // instrusive link field for threads
-                struct $thread * next;
 
                 struct {
@@ -202 +177 @@
                         // previous function to park/unpark the thread
                         const char * park_caller;
-                        enum coroutine_state park_result;
+                        int park_result;
+                        enum __Coroutine_State park_state;
                         bool park_stale;
                         const char * unpark_caller;
-                        enum coroutine_state unpark_result;
+                        int unpark_result;
+                        enum __Coroutine_State unpark_state;
                         bool unpark_stale;
                 #endif
@@ -218 +195 @@
         #ifdef __cforall
         extern "Cforall" {
+
                 static inline $thread *& get_next( $thread & this ) __attribute__((const)) {
-                        return this.next;
+                        return this.link.next;
                 }