Changeset 6a4ef0c

Timestamp:

Nov 10, 2022, 12:14:23 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

a757ba1

Parents:

5ce0659

Message:

Changed cltr_link to use explicit field name to make gdb easier

Location:

libcfa/src

Files:

• bits/defs.hfa (modified) (1 diff)
• concurrency/invoke.h (modified) (2 diffs)
• concurrency/kernel.hfa (modified) (1 diff)
• concurrency/kernel/startup.cfa (modified) (1 diff)

libcfa/src/bits/defs.hfa

@@ -30 +30 @@
 #ifdef __cforall
 #define __cfa_anonymous_object(x) inline struct x
-#define __cfa_dlink1(x) dlink(x)
-#define __cfa_dlink2(x, name) inline struct name { inline dlink(x); }
+#define __cfa_dlink(x) struct { inline dlink(x); }
 #else
 #define __cfa_anonymous_object(x) struct x __cfa_anonymous_object
-#define __cfa_dlink1(x) struct { struct x * next; struct x * back; }
-#define __cfa_dlink2(x, name) struct { struct x * next; struct x * back; } __dlink ## name
+#define __cfa_dlink(x) struct { struct x * next; struct x * back; }
 #endif
 

libcfa/src/concurrency/invoke.h

@@ -197 +197 @@
                 // intrusive link fields, used for locks, monitors and any user defined data structure
                 // default link fields for dlist
-                __cfa_dlink1(thread$) user_link;
+                __cfa_dlink(thread$) user_link;
 
                 // secondary intrusive link fields, used for global cluster list
                 // default link fields for dlist
-                __cfa_dlink2(thread$, cltr_link);
+                __cfa_dlink(thread$) cltr_link;
 
                 // used to store state between clh lock/unlock
@@ -244 +244 @@
                 }
 
-                P9_EMBEDDED(thread$, thread$.cltr_link)
-                P9_EMBEDDED(thread$.cltr_link, dlink(thread$))
+                static inline tytagref(typeof(((struct thread$ *)0p)->cltr_link), dlink(thread$)) ?`inner( struct thread$ & this ) {
+                        typeof(this.cltr_link) & ib = this.cltr_link;
+                        dlink(thread$) & b = ib`inner;
+                        tytagref(typeof(this.cltr_link), dlink(thread$)) result = { b };
+                        return result;
+                }
+
+                P9_EMBEDDED(typeof(((struct thread$ *)0p)->cltr_link), dlink(thread$))
 
                 static inline void ?{}(__monitor_group_t & this) {

libcfa/src/concurrency/kernel.hfa

@@ -256 +256 @@
         // List of threads
         __spinlock_t thread_list_lock;
-        dlist(struct thread$, thread$.cltr_link) threads;
+        dlist(struct thread$, typeof(((struct thread$ *)0p)->cltr_link)) threads;
         unsigned int nthreads;
 

libcfa/src/concurrency/kernel/startup.cfa

@@ -745 +745 @@
         {
                 tytagref( dlink(thread$), dlink(thread$) ) ?`inner( thread$ & this ) = void;
-                with( DLINK_VIA( thread$, thread$.cltr_link ) )
+                with( DLINK_VIA( thread$, typeof(((struct thread$ *)0p)->cltr_link) ) )
                         remove( thrd );
                 cltr->nthreads -= 1;