Changes in libcfa/src/concurrency/kernel.hfa [7768b8d:d4e68a6]

File:

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

libcfa/src/concurrency/kernel.hfa

@@ -106 +106 @@
         // Cluster from which to get threads
         struct cluster * cltr;
-        unsigned int id;
 
         // Name of the processor
@@ -158 +157 @@
 }
 
-
-//-----------------------------------------------------------------------------
-// Cluster Tools
-struct __processor_id;
-
-// Reader-Writer lock protecting the ready-queue
-struct __clusterRWLock_t {
-        // total cachelines allocated
-        unsigned int max;
-
-        // cachelines currently in use
-        volatile unsigned int alloc;
-
-        // cachelines ready to itereate over
-        // (!= to alloc when thread is in second half of doregister)
-        volatile unsigned int ready;
-
-        // writer lock
-        volatile bool lock;
-
-        // data pointer
-        __processor_id * data;
-};
-
-void  ?{}(__clusterRWLock_t & this);
-void ^?{}(__clusterRWLock_t & this);
-
-// Underlying sub quues of the ready queue
-struct __attribute__((aligned(128))) __intrusive_ready_queue_t {
-        // spin lock protecting the queue
-        volatile bool lock;
-
-        // anchor for the head and the tail of the queue
-        struct __sentinel_t {
-                struct thread_desc * next;
-                struct thread_desc * prev;
-                unsigned long long ts;
-        } before, after;
-
-        // Optional statistic counters
-        #ifndef __CFA_NO_SCHED_STATS__
-                struct __attribute__((aligned(64))) {
-                        // difference between number of push and pops
-                        ssize_t diff;
-
-                        // total number of pushes and pops
-                        size_t  push;
-                        size_t  pop ;
-                } stat;
-        #endif
-};
-
-void  ?{}(__intrusive_ready_queue_t & this);
-void ^?{}(__intrusive_ready_queue_t & this);
-
 //-----------------------------------------------------------------------------
 // Cluster
 struct cluster {
         // Ready queue locks
-        __clusterRWLock_t ready_lock;
+        __spinlock_t ready_queue_lock;
 
         // Ready queue for threads
-        __intrusive_ready_queue_t ready_queue;
+        __queue_t(thread_desc) ready_queue;
 
         // Name of the cluster
@@ -230 +174 @@
         // List of processors
         __spinlock_t proc_list_lock;
+        __dllist_t(struct processor) procs;
         __dllist_t(struct processor) idles;
+        unsigned int nprocessors;
 
         // List of threads