Changeset 63be3387 for libcfa/src/concurrency/invoke.h

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (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) (5 diffs)

libcfa/src/concurrency/invoke.h

@@ -146 +146 @@
 
         // Link lists fields
-        // instrusive link field for threads
+        // instrusive link field for threads in the ready-queue
         struct __thread_desc_link {
                 struct thread$ * next;
                 volatile unsigned long long ts;
         };
+
+        // Link lists fields
+        // instrusive link field for threads in the user_link/cltr_link
+        struct __thread_user_link {
+                #ifdef __cforall
+                        inline dlink(thread$);
+                #else
+                        struct thread$ * next; struct thread$ * back;
+                #endif
+        };
+        _Static_assert(sizeof(struct __thread_user_link) == 2 * sizeof(struct thread$ *), "__thread_user_link should be consistent in C and Cforall");
 
         struct thread$ {
@@ -159 +170 @@
                 // Link lists fields
                 // instrusive link field for threads
-                struct __thread_desc_link link;
+                struct __thread_desc_link rdy_link;
 
                 // current execution status for coroutine
@@ -195 +206 @@
                 struct __monitor_group_t monitors;
 
-                // used to put threads on dlist data structure
-                __cfa_dlink(thread$);
-
-                struct {
-                        struct thread$ * next;
-                        struct thread$ * prev;
-                } node;
+                // intrusive link fields, used for locks, monitors and any user defined data structure
+                // default link fields for dlist
+                struct __thread_user_link user_link;
+
+                // secondary intrusive link fields, used for global cluster list
+                // default link fields for dlist
+                struct __thread_user_link cltr_link;
 
                 // used to store state between clh lock/unlock
@@ -214 +225 @@
 
                 #if defined( __CFA_WITH_VERIFY__ )
+                        struct processor * volatile executing;
                         void * canary;
                 #endif
         };
-        #ifdef __cforall
-                P9_EMBEDDED( thread$, dlink(thread$) )
-        #endif
+
         // Wrapper for gdb
         struct cfathread_thread_t { struct thread$ debug; };
@@ -231 +241 @@
         #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.link.next;
-                }
-
-                static inline [thread$ *&, thread$ *& ] __get( thread$ & this ) __attribute__((const)) {
-                        return this.node.[next, prev];
-                }
+                        return this.user_link.next;
+                }
+
+                static inline tytagref( dlink(thread$), dlink(thread$) ) ?`inner( thread$ & this ) {
+                        dlink(thread$) & b = this.user_link;
+                        tytagref( dlink(thread$), dlink(thread$) ) result = { b };
+                        return result;
+                }
+
+                static inline tytagref(struct __thread_user_link, dlink(thread$)) ?`inner( struct thread$ & this ) {
+                        struct __thread_user_link & ib = this.cltr_link;
+                        dlink(thread$) & b = ib`inner;
+                        tytagref(struct __thread_user_link, dlink(thread$)) result = { b };
+                        return result;
+                }
+
+                P9_EMBEDDED(struct __thread_user_link, dlink(thread$))
 
                 static inline void ?{}(__monitor_group_t & this) {