Changeset 8d66610 for libcfa/src/concurrency/kernel.hfa

Timestamp:

May 21, 2021, 4:48:10 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f1bce515

Parents:

5407cdc (diff), 7404cdc (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 branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

libcfa/src/concurrency/kernel.hfa

@@ -49 +49 @@
 
 // Processor id, required for scheduling threads
-struct __processor_id_t {
-        unsigned id:24;
-
-        #if !defined(__CFA_NO_STATISTICS__)
-                struct __stats_t * stats;
-        #endif
-};
+
 
 coroutine processorCtx_t {
@@ -63 +57 @@
 // Wrapper around kernel threads
 struct __attribute__((aligned(128))) processor {
-        // Main state
-        inline __processor_id_t;
-
         // Cluster from which to get threads
         struct cluster * cltr;
@@ -90 +81 @@
         pthread_t kernel_thread;
 
+        // Unique id for the processor (not per cluster)
+        unsigned unique_id;
+
         struct {
                 $io_context * ctx;
@@ -113 +107 @@
 
         // Link lists fields
-        DLISTED_MGD_IMPL_IN(processor)
+        inline dlink(processor);
 
         // special init fields
@@ -123 +117 @@
         } init;
 
+        struct KernelThreadData * local_data;
+
         #if !defined(__CFA_NO_STATISTICS__)
                 int print_stats;
@@ -133 +129 @@
 #endif
 };
+P9_EMBEDDED( processor, dlink(processor) )
 
 void  ?{}(processor & this, const char name[], struct cluster & cltr);
@@ -140 +137 @@
 static inline void  ?{}(processor & this, struct cluster & cltr) { this{ "Anonymous Processor", cltr}; }
 static inline void  ?{}(processor & this, const char name[])     { this{name, *mainCluster}; }
-
-DLISTED_MGD_IMPL_OUT(processor)
 
 //-----------------------------------------------------------------------------
@@ -152 +147 @@
 
 // Aligned timestamps which are used by the relaxed ready queue
-struct __attribute__((aligned(128))) __timestamp_t;
-void  ?{}(__timestamp_t & this);
-void ^?{}(__timestamp_t & this);
+struct __attribute__((aligned(128))) __timestamp_t {
+        volatile unsigned long long tv;
+};
+
+static inline void  ?{}(__timestamp_t & this) { this.tv = 0; }
+static inline void ^?{}(__timestamp_t & this) {}
 
 //TODO adjust cache size to ARCHITECTURE
@@ -177 +175 @@
 void  ?{}(__ready_queue_t & this);
 void ^?{}(__ready_queue_t & this);
+#if !defined(__CFA_NO_STATISTICS__)
+        unsigned cnt(const __ready_queue_t & this, unsigned idx);
+#endif
 
 // Idle Sleep
@@ -190 +191 @@
 
         // List of idle processors
-        dlist(processor, processor) idles;
+        dlist(processor) idles;
 
         // List of active processors
-        dlist(processor, processor) actives;
+        dlist(processor) actives;
 };