Changeset e2f601f for libcfa/src/concurrency

Timestamp:

May 13, 2021, 3:49:30 PM (4 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:

aff7e86, c457dc41

Parents:

8cd5434 (diff), 69914cbc (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

Location:

libcfa/src/concurrency

Files:

• alarm.hfa (modified) (3 diffs)
• kernel.cfa (modified) (1 diff)
• kernel.hfa (modified) (4 diffs)
• ready_queue.cfa (modified) (1 diff)

libcfa/src/concurrency/alarm.hfa

@@ -49 +49 @@
         Duration period;                        // if > 0 => period of alarm
 
-        DLISTED_MGD_IMPL_IN(alarm_node_t)
+        inline dlink(alarm_node_t);
 
         union {
@@ -60 +60 @@
         enum alarm_type type;           // true if this is not a user defined alarm
 };
-DLISTED_MGD_IMPL_OUT(alarm_node_t)
+P9_EMBEDDED( alarm_node_t, dlink(alarm_node_t) )
 
 void ?{}( alarm_node_t & this, $thread * thrd, Time alarm, Duration period );
@@ -67 +67 @@
 void ^?{}( alarm_node_t & this );
 
-typedef dlist(alarm_node_t, alarm_node_t) alarm_list_t;
+typedef dlist(alarm_node_t) alarm_list_t;
 
 void insert( alarm_list_t * this, alarm_node_t * n );

libcfa/src/concurrency/kernel.cfa

@@ -903 +903 @@
         }
 
-        static void crawl_list( cluster * cltr, dlist(processor, processor) & list, unsigned count ) {
+        static void crawl_list( cluster * cltr, dlist(processor) & list, unsigned count ) {
                 /* paranoid */ verify( cltr->stats );
 

libcfa/src/concurrency/kernel.hfa

@@ -107 +107 @@
 
         // Link lists fields
-        DLISTED_MGD_IMPL_IN(processor)
+        inline dlink(processor);
 
         // special init fields
@@ -129 +129 @@
 #endif
 };
+P9_EMBEDDED( processor, dlink(processor) )
 
 void  ?{}(processor & this, const char name[], struct cluster & cltr);
@@ -136 +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)
 
 //-----------------------------------------------------------------------------
@@ -192 +191 @@
 
         // List of idle processors
-        dlist(processor, processor) idles;
+        dlist(processor) idles;
 
         // List of active processors
-        dlist(processor, processor) actives;
+        dlist(processor) actives;
 };
 

libcfa/src/concurrency/ready_queue.cfa

@@ -552 +552 @@
 }
 
-static void assign_list(unsigned & value, dlist(processor, processor) & list, unsigned count) {
+static void assign_list(unsigned & value, dlist(processor) & list, unsigned count) {
         processor * it = &list`first;
         for(unsigned i = 0; i < count; i++) {