Changeset 160f1aa

Timestamp:

Sep 23, 2022, 3:41:22 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

996c8ed

Parents:

43db35e

Message:

Changed links of processors in cluster to avoid anonymous names, which are too brittle for gdb to follow

Files:

• libcfa/src/concurrency/kernel.hfa (modified) (2 diffs)
• tools/gdb/utils-gdb.py (modified) (3 diffs)

libcfa/src/concurrency/kernel.hfa

@@ -136 +136 @@
 
         // Link lists fields
-        inline dlink(processor);
+        dlink(processor) link;
 
         // special init fields
@@ -158 +158 @@
 #endif
 };
-P9_EMBEDDED( processor, dlink(processor) )
+// P9_EMBEDDED( processor, dlink(processor) )
+static inline tytagref( dlink(processor), dlink(processor) ) ?`inner( processor & this ) {
+    dlink(processor) & b = this.link;
+    tytagref( dlink(processor), dlink(processor) ) result = { b };
+    return result;
+}
 
 void  ?{}(processor & this, const char name[], struct cluster & cltr);

tools/gdb/utils-gdb.py

@@ -159 +159 @@
 
                 # if we already saw the root, then go forward
-                my_next = self.curr['__anonymous_object2225']['_X4nextPY13__tE_generic__1']
+                my_next = self.curr['_X4link']['_X4nextPY13__tE_generic__1']
                 self.curr = my_next.cast(cfa_t.processor_ptr)
 
@@ -168 +168 @@
                 return self.curr
 
+def start_from_dlist(dlist):
+        fs = dlist.type.fields()
+        if len(fs) != 1:
+                print("Error, can't understand dlist type for", dlist, dlist.name, dlist.type)
+                return None
+
+        return dlist[fs[0]]
+
 def proc_list(cluster):
         """
@@ -174 +182 @@
         cfa_t = get_cfa_types()
         proclist = cluster['_X5procsS19__cluster_proc_list_1']
-        idle = proclist['_X5idlesS5dlist_S9processorS5dlink_S9processor___1']['__anonymous_object2167']['_X4nextPY13__tE_generic__1']
-        active = proclist['_X7activesS5dlist_S9processorS5dlink_S9processor___1']['__anonymous_object2167']['_X4nextPY13__tE_generic__1']
+
+        idle = start_from_dlist(proclist['_X5idlesS5dlist_S9processorS5dlink_S9processor___1'])
+        active = start_from_dlist(proclist['_X7activesS5dlist_S9processorS5dlink_S9processor___1'])
         return ProcIter(active.cast(cfa_t.processor_ptr)), ProcIter(idle.cast(cfa_t.processor_ptr))