Changes in libcfa/src/concurrency/kernel.hfa [13c5e19:dd4e2d7]

File:

• libcfa/src/concurrency/kernel.hfa (modified) (9 diffs)

libcfa/src/concurrency/kernel.hfa

@@ -22 +22 @@
 #include "time_t.hfa"
 #include "coroutine.hfa"
-
-#include "containers/stackLockFree.hfa"
 
 extern "C" {
@@ -49 +47 @@
 extern struct cluster * mainCluster;
 
-// Processor id, required for scheduling threads
-struct __processor_id_t {
-        unsigned id;
-
-        #if !defined(__CFA_NO_STATISTICS__)
-                struct __stats_t * stats;
-        #endif
-};
-
+// Processor
 coroutine processorCtx_t {
         struct processor * proc;
@@ -63 +53 @@
 
 // Wrapper around kernel threads
-struct __attribute__((aligned(128))) processor {
+struct processor {
         // Main state
-        inline __processor_id_t;
+        // Coroutine ctx who does keeps the state of the processor
+        struct processorCtx_t runner;
 
         // Cluster from which to get threads
         struct cluster * cltr;
-
-        // Set to true to notify the processor should terminate
-        volatile bool do_terminate;
-
-        // Coroutine ctx who does keeps the state of the processor
-        struct processorCtx_t runner;
 
         // Name of the processor
@@ -96 +81 @@
         __bin_sem_t idle;
 
+        // Termination
+        // Set to true to notify the processor should terminate
+        volatile bool do_terminate;
+
         // Termination synchronisation (user semaphore)
         semaphore terminated;
@@ -103 +92 @@
 
         // Link lists fields
-        Link(processor) link;
+        struct __dbg_node_proc {
+                struct processor * next;
+                struct processor * prev;
+        } node;
 
 #ifdef __CFA_DEBUG__
@@ -118 +110 @@
 static inline void  ?{}(processor & this, const char name[]) { this{name, *mainCluster }; }
 
-static inline Link(processor) * ?`next( processor * this ) { return &this->link; }
+static inline [processor *&, processor *& ] __get( processor & this ) __attribute__((const)) { return this.node.[next, prev]; }
 
 //-----------------------------------------------------------------------------
@@ -129 +121 @@
 #define CFA_CLUSTER_IO_BUFFLEN_OFFSET        16
 
-
-//-----------------------------------------------------------------------------
-// Cluster Tools
-
-// Intrusives lanes which are used by the relaxed ready queue
-struct __attribute__((aligned(128))) __intrusive_lane_t;
-void  ?{}(__intrusive_lane_t & this);
-void ^?{}(__intrusive_lane_t & this);
-
-// Counter used for wether or not the lanes are all empty
-struct __attribute__((aligned(128))) __snzi_node_t;
-struct __snzi_t {
-        unsigned mask;
-        int root;
-        __snzi_node_t * nodes;
-};
-
-void  ?{}( __snzi_t & this, unsigned depth );
-void ^?{}( __snzi_t & this );
-
-//TODO adjust cache size to ARCHITECTURE
-// Structure holding the relaxed ready queue
-struct __ready_queue_t {
-        // Data tracking how many/which lanes are used
-        // Aligned to 128 for cache locality
-        __snzi_t snzi;
-
-        // Data tracking the actual lanes
-        // On a seperate cacheline from the used struct since
-        // used can change on each push/pop but this data
-        // only changes on shrink/grow
-        struct {
-                // Arary of lanes
-                __intrusive_lane_t * volatile data;
-
-                // Number of lanes (empty or not)
-                volatile size_t count;
-        } lanes;
-};
-
-void  ?{}(__ready_queue_t & this);
-void ^?{}(__ready_queue_t & this);
-
 //-----------------------------------------------------------------------------
 // Cluster
-struct __attribute__((aligned(128))) cluster {
+struct cluster {
+        // Ready queue locks
+        __spinlock_t ready_queue_lock;
+
         // Ready queue for threads
-        __ready_queue_t ready_queue;
+        __queue_t($thread) ready_queue;
 
         // Name of the cluster
@@ -184 +136 @@
         Duration preemption_rate;
 
-        // List of idle processors
-        StackLF(processor) idles;
-        volatile unsigned int nprocessors;
+        // List of processors
+        __spinlock_t idle_lock;
+        __dllist_t(struct processor) procs;
+        __dllist_t(struct processor) idles;
+        unsigned int nprocessors;
 
         // List of threads
@@ -203 +157 @@
         #if !defined(__CFA_NO_STATISTICS__)
                 bool print_stats;
-                struct __stats_t * stats;
         #endif
 };