Changeset ff29f08 for src/libcfa/concurrency/kernel

Timestamp:

May 18, 2018, 2:09:21 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into with_gc

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;
+// Processor
+extern struct cluster * mainCluster;
 
-        // 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
 enum FinishOpCode { No_Action, Release, Schedule, Release_Schedule, Release_Multi, Release_Multi_Schedule };
 
@@ -90 +74 @@
 
         // Cluster from which to get threads
-        cluster * cltr;
+        struct cluster * cltr;
+
+        // Name of the processor
+        const char * name;
 
         // Handle to pthreads
@@ -113 +100 @@
         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
@@ -119 +114 @@
 };
 
-void  ?{}(processor & this);
-void  ?{}(processor & this, cluster * cltr);
+void  ?{}(processor & this, const char * name, struct 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: //