Changeset df6cc9d for tools/gdb/utils-gdb.py

Timestamp:

Oct 19, 2022, 4:43:26 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

1a45263

Parents:

9cd5bd2 (diff), 135143ba (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' into pthread-emulation

File:

• tools/gdb/utils-gdb.py (modified) (4 diffs)

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['_X4linkS5dlink_S9processor__1']['_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))
 
@@ -346 +355 @@
                 ))
                 tls = tls_for_proc( processor )
-                thrd = tls['_X11this_threadVPS7thread$_1']
+                thrd = thread_for_proc( processor )
                 if thrd != 0x0:
                         tname = '{} {}'.format(thrd['self_cor']['name'].string(), str(thrd))