Changes in libcfa/src/concurrency/invoke.h [d72c074:ae7be7a]

File:

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

libcfa/src/concurrency/invoke.h

@@ -48 +48 @@
                 extern __attribute__((aligned(128))) thread_local struct KernelThreadData {
                         struct $thread    * volatile this_thread;
-                        struct processor  * volatile this_processor;
-                        struct __stats_t  * volatile this_stats;
+                        struct processor      * volatile this_processor;
 
                         struct {
@@ -57 +56 @@
                         } preemption_state;
 
-                        __uint128_t rand_seed;
+                        uint32_t rand_seed;
                 } kernelTLS __attribute__ ((tls_model ( "initial-exec" )));
         }
@@ -93 +92 @@
         };
 
-        enum __Coroutine_State { Halted, Start, Primed, Blocked, Ready, Active };
+        enum coroutine_state { Halted, Start, Primed, Blocked, Ready, Active, Rerun };
         enum __Preemption_Reason { __NO_PREEMPTION, __ALARM_PREEMPTION, __POLL_PREEMPTION, __MANUAL_PREEMPTION };
 
@@ -107 +106 @@
 
                 // current execution status for coroutine
-                enum __Coroutine_State state;
+                enum coroutine_state state;
 
                 // first coroutine to resume this one
@@ -162 +161 @@
         };
 
-        // 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
@@ -177 +167 @@
 
                 // current execution status for coroutine
-                volatile int ticket;
-                enum __Coroutine_State state:8;
-                enum __Preemption_Reason preempted:8;
+                volatile int state;
+                enum __Preemption_Reason preempted;
 
                 //SKULLDUGGERY errno is not save in the thread data structure because returnToKernel appears to be the only function to require saving and restoring it
+
+                // coroutine body used to store context
+                struct $coroutine  self_cor;
+
+                // current active context
+                struct $coroutine * curr_cor;
+
+                // monitor body used for mutual exclusion
+                struct $monitor    self_mon;
+
+                // pointer to monitor with sufficient lifetime for current monitors
+                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_desc_link link;
-
-                // coroutine body used to store context
-                struct $coroutine  self_cor;
-
-                // current active context
-                struct $coroutine * curr_cor;
-
-                // monitor body used for mutual exclusion
-                struct $monitor    self_mon;
-
-                // pointer to monitor with sufficient lifetime for current monitors
-                struct $monitor *  self_mon_p;
-
-                // monitors currently held by this thread
-                struct __monitor_group_t monitors;
+                struct $thread * next;
 
                 struct {
@@ -213 +202 @@
                         // previous function to park/unpark the thread
                         const char * park_caller;
-                        int park_result;
-                        enum __Coroutine_State park_state;
+                        enum coroutine_state park_result;
                         bool park_stale;
                         const char * unpark_caller;
-                        int unpark_result;
-                        enum __Coroutine_State unpark_state;
+                        enum coroutine_state unpark_result;
                         bool unpark_stale;
                 #endif
@@ -231 +218 @@
         #ifdef __cforall
         extern "Cforall" {
-
                 static inline $thread *& get_next( $thread & this ) __attribute__((const)) {
-                        return this.link.next;
+                        return this.next;
                 }