Changes in src/libcfa/concurrency/kernel [de94a60:0f56058]

File:

• src/libcfa/concurrency/kernel (modified) (4 diffs)

src/libcfa/concurrency/kernel

@@ -40 +40 @@
 
 //-----------------------------------------------------------------------------
+// Cluster
+struct cluster {
+        // Ready queue locks
+        __spinlock_t ready_queue_lock;
+
+        // Ready queue for threads
+        __queue_t(thread_desc) ready_queue;
+
+        // Preemption rate on this cluster
+        Duration preemption_rate;
+};
+
+extern Duration default_preemption();
+
+void ?{} (cluster & this);
+void ^?{}(cluster & this);
+
+//-----------------------------------------------------------------------------
 // Processor
-extern struct cluster * mainCluster;
-
 enum FinishOpCode { No_Action, Release, Schedule, Release_Schedule, Release_Multi, Release_Multi_Schedule };
 
@@ -74 +90 @@
 
         // Cluster from which to get threads
-        struct cluster * cltr;
-
-        // Name of the processor
-        const char * name;
+        cluster * cltr;
 
         // Handle to pthreads
@@ -100 +113 @@
         bool pending_preemption;
 
-        // Idle lock
-
-        // Link lists fields
-        struct {
-                struct processor * next;
-                struct processor * prev;
-        } node;
-
 #ifdef __CFA_DEBUG__
         // Last function to enable preemption on this processor
@@ -114 +119 @@
 };
 
-void  ?{}(processor & this, const char * name, struct cluster & cltr);
+void  ?{}(processor & this);
+void  ?{}(processor & this, cluster * cltr);
 void ^?{}(processor & this);
-
-static inline void  ?{}(processor & this)                    { this{ "Anonymous Processor", *mainCluster}; }
-static inline void  ?{}(processor & this, struct cluster & cltr)    { this{ "Anonymous Processor", cltr}; }
-static inline void  ?{}(processor & this, const char * name) { this{name, *mainCluster }; }
-
-static inline [processor *&, processor *& ] __get( processor & this ) {
-        return this.node.[next, prev];
-}
-
-//-----------------------------------------------------------------------------
-// Cluster
-struct cluster {
-        // Ready queue locks
-        __spinlock_t ready_queue_lock;
-
-        // Ready queue for threads
-        __queue_t(thread_desc) ready_queue;
-
-        // Name of the cluster
-        const char * name;
-
-        // Preemption rate on this cluster
-        Duration preemption_rate;
-
-        // List of processors
-        __spinlock_t proc_list_lock;
-        __dllist_t(struct processor) procs;
-        __dllist_t(struct processor) idles;
-
-        // Link lists fields
-        struct {
-                cluster * next;
-                cluster * prev;
-        } node;
-};
-extern Duration default_preemption();
-
-void ?{} (cluster & this, const char * name, Duration preemption_rate);
-void ^?{}(cluster & this);
-
-static inline void ?{} (cluster & this)                           { this{"Anonymous Cluster", default_preemption()}; }
-static inline void ?{} (cluster & this, Duration preemption_rate) { this{"Anonymous Cluster", preemption_rate}; }
-static inline void ?{} (cluster & this, const char * name)        { this{name, default_preemption()}; }
-
-static inline [cluster *&, cluster *& ] __get( cluster & this ) {
-        return this.node.[next, prev];
-}
 
 // Local Variables: //