Changeset 6abcb4d

Timestamp:

Apr 16, 2021, 12:37:34 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

431cd4f

Parents:

9cc3a18

Message:

Fixed printing of thread state in gdb

File:

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

tools/gdb/utils-gdb.py

@@ -23 +23 @@
 gdb.execute('handle SIGUSR1 nostop noprint pass')
 
-CfaTypes = collections.namedtuple('CfaTypes', 'cluster_ptr processor_ptr thread_ptr int_ptr thread_state')
+CfaTypes = collections.namedtuple('CfaTypes', 'cluster_ptr processor_ptr thread_ptr int_ptr thread_state yield_state')
 
 class ThreadInfo:
@@ -52 +52 @@
         # GDB types for various structures/types in CFA
         return CfaTypes(cluster_ptr = gdb.lookup_type('struct cluster').pointer(),
-                                  processor_ptr = gdb.lookup_type('struct processor').pointer(),
-                                         thread_ptr = gdb.lookup_type('struct $thread').pointer(),
-                                                int_ptr = gdb.lookup_type('int').pointer(),
-                                   thread_state = gdb.lookup_type('enum __Coroutine_State'))
+                processor_ptr = gdb.lookup_type('struct processor').pointer(),
+                thread_ptr = gdb.lookup_type('struct $thread').pointer(),
+                int_ptr = gdb.lookup_type('int').pointer(),
+                thread_state = gdb.lookup_type('enum __Coroutine_State'),
+                yield_state = gdb.lookup_type('enum __Preemption_Reason'))
 
 def get_addr(addr):
@@ -371 +372 @@
         def print_thread(self, thread, tid, marked):
                 cfa_t = get_cfa_types()
-                self.print_formatted(marked, tid, thread['self_cor']['name'].string(), str(thread['state'].cast(cfa_t.thread_state)), str(thread))
+                ys = str(thread['preempted'].cast(cfa_t.yield_state))
+                if ys == '_X15__NO_PREEMPTIONKM19__Preemption_Reason_1':
+                        state = str(thread['state'].cast(cfa_t.thread_state))
+                elif ys == '_X18__ALARM_PREEMPTIONKM19__Preemption_Reason_1':
+                        state = 'preempted'
+                elif ys == '_X19__MANUAL_PREEMPTIONKM19__Preemption_Reason_1':
+                        state = 'yield'
+                elif ys == '_X17__POLL_PREEMPTIONKM19__Preemption_Reason_1':
+                        state = 'poll'
+                else:
+                        print("error: thread {} in undefined preemption state {}".format(thread, ys))
+                        state = 'error'
+                self.print_formatted(marked, tid, thread['self_cor']['name'].string(), state, str(thread))
 
         def print_threads_by_cluster(self, cluster, print_system = False):