Changes in libcfa/src/concurrency/kernel.hfa [431cd4f:5cb51502]

File:

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

libcfa/src/concurrency/kernel.hfa

@@ -69 +69 @@
         struct cluster * cltr;
 
-        // Ready Queue state per processor
-        struct {
-                unsigned short its;
-                unsigned short itr;
-                unsigned id;
-                unsigned target;
-                unsigned long long int cutoff;
-        } rdq;
+        // Id within the cluster
+        unsigned cltr_id;
 
         // Set to true to notify the processor should terminate
@@ -146 +140 @@
 // Cluster Tools
 
-// Intrusives lanes which are used by the ready queue
+// 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);
 
-// Aligned timestamps which are used by the relaxed ready queue
-struct __attribute__((aligned(128))) __timestamp_t;
-void  ?{}(__timestamp_t & this);
-void ^?{}(__timestamp_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
@@ -167 +171 @@
                 __intrusive_lane_t * volatile data;
 
-                // Array of times
-                __timestamp_t * volatile tscs;
-
                 // Number of lanes (empty or not)
                 volatile size_t count;
@@ -179 +180 @@
 
 // Idle Sleep
-struct __cluster_proc_list {
+struct __cluster_idles {
         // Spin lock protecting the queue
         volatile uint64_t lock;
@@ -190 +191 @@
 
         // List of idle processors
-        dlist(processor, processor) idles;
-
-        // List of active processors
-        dlist(processor, processor) actives;
+        dlist(processor, processor) list;
 };
 
@@ -209 +207 @@
 
         // List of idle processors
-        __cluster_proc_list procs;
+        __cluster_idles idles;
 
         // List of threads