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

File:

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

libcfa/src/concurrency/kernel.hfa

@@ -23 +23 @@
 #include "coroutine.hfa"
 
+#include "containers/stackLockFree.hfa"
+
 extern "C" {
 #include <pthread.h>
@@ -47 +49 @@
 extern struct cluster * mainCluster;
 
-// Processor
+// Processor id, required for scheduling threads
+struct __processor_id_t {
+        unsigned id;
+
+        #if !defined(__CFA_NO_STATISTICS__)
+                struct __stats_t * stats;
+        #endif
+};
+
 coroutine processorCtx_t {
         struct processor * proc;
@@ -53 +63 @@
 
 // Wrapper around kernel threads
-struct processor {
+struct __attribute__((aligned(128))) processor {
         // Main state
+        inline __processor_id_t;
+
+        // 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;
-
-        // Cluster from which to get threads
-        struct cluster * cltr;
 
         // Name of the processor
@@ -81 +96 @@
         __bin_sem_t idle;
 
-        // Termination
-        // Set to true to notify the processor should terminate
-        volatile bool do_terminate;
-
         // Termination synchronisation (user semaphore)
         semaphore terminated;
@@ -92 +103 @@
 
         // Link lists fields
-        struct __dbg_node_proc {
-                struct processor * next;
-                struct processor * prev;
-        } node;
+        Link(processor) link;
 
 #ifdef __CFA_DEBUG__
@@ -110 +118 @@
 static inline void  ?{}(processor & this, const char name[]) { this{name, *mainCluster }; }
 
-static inline [processor *&, processor *& ] __get( processor & this ) __attribute__((const)) { return this.node.[next, prev]; }
+static inline Link(processor) * ?`next( processor * this ) { return &this->link; }
 
 //-----------------------------------------------------------------------------
@@ -121 +129 @@
 #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 cluster {
-        // Ready queue locks
-        __spinlock_t ready_queue_lock;
-
+struct __attribute__((aligned(128))) cluster {
         // Ready queue for threads
-        __queue_t($thread) ready_queue;
+        __ready_queue_t ready_queue;
 
         // Name of the cluster
@@ -136 +184 @@
         Duration preemption_rate;
 
-        // List of processors
-        __spinlock_t idle_lock;
-        __dllist_t(struct processor) procs;
-        __dllist_t(struct processor) idles;
-        unsigned int nprocessors;
+        // List of idle processors
+        StackLF(processor) idles;
+        volatile unsigned int nprocessors;
 
         // List of threads
@@ -157 +203 @@
         #if !defined(__CFA_NO_STATISTICS__)
                 bool print_stats;
+                struct __stats_t * stats;
         #endif
 };