Changeset e50d9cb8 for libcfa/src/concurrency/invoke.h

Timestamp:

Nov 1, 2022, 10:06:40 PM (18 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

7cf8006

Parents:

0bdfcc3 (diff), 03c56f6 (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/invoke.h (modified) (3 diffs)

libcfa/src/concurrency/invoke.h

@@ -195 +195 @@
                 struct __monitor_group_t monitors;
 
-                // used to put threads on dlist data structure
+                // intrusive link fields, used for locks, monitors and any user defined data structure
+                // default link fields for dlist
                 __cfa_dlink1(thread$) user_link;
 
-                struct {
-                        struct thread$ * next;
-                        struct thread$ * prev;
-                } node;
+                // secondary intrusive link fields, used for global cluster list
+                // default link fields for dlist
+                __cfa_dlink2(thread$, cltr_link);
 
                 // used to store state between clh lock/unlock
@@ -230 +230 @@
         #ifdef __cforall
         extern "Cforall" {
+                static inline thread$ * volatile & ?`next ( thread$ * this ) {
+                        return this->user_link.next;
+                }
 
                 static inline thread$ *& get_next( thread$ & this ) __attribute__((const)) {
                         return this.user_link.next;
-                }
-
-                static inline [thread$ *&, thread$ *& ] __get( thread$ & this ) __attribute__((const)) {
-                        return this.node.[next, prev];
                 }
 
@@ -244 +243 @@
                         return result;
                 }
+
+                P9_EMBEDDED(thread$, thread$.cltr_link)
+                P9_EMBEDDED(thread$.cltr_link, dlink(thread$))
 
                 static inline void ?{}(__monitor_group_t & this) {