espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/coredump_thread_info_failure' into 'master'

Browse Source 
espcoredump: fix exception when -thread-info fails

See merge request espressif/esp-idf!10720
This commit is contained in:
Ivan Grokhotkov
2020-10-09 19:36:36 +08:00
parent a587cd1774 5eebdd1de2
commit eb83878323
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
components/espcoredump/espcoredump.py
View File

@@ -1281,12 +1281,12 @@ def gdbmi_cmd_exec_console(p, gdb_cmd): # type: (GdbController, str) -> str
.replace('\\n', '\n').replace('\\t', '\t').rstrip("\n") .replace('\\n', '\n').replace('\\t', '\t').rstrip("\n")
def gdbmi_get_thread_ids(p): # type: (GdbController) -> (str, typing.List[str]) def gdbmi_get_threads(p): # type: (GdbController) -> (typing.List[dict], str)
""" Get the current thread ID and the list of all thread IDs known to GDB, as strings """ """ Get information about all threads known to GDB, and the current thread ID """
result = gdbmi_run_cmd_get_one_response(p, "-thread-list-ids", "done", "result")["payload"] result = gdbmi_run_cmd_get_one_response(p, "-thread-info", "done", "result")["payload"]
current_thread_id = result["current-thread-id"] current_thread_id = result["current-thread-id"]
thread_ids = result["thread-ids"]["thread-id"] threads = result["threads"]
return current_thread_id, thread_ids return threads, current_thread_id
def gdbmi_switch_thread(p, thr_id): # type: (GdbController, str) -> None def gdbmi_switch_thread(p, thr_id): # type: (GdbController, str) -> None
@@ -1294,11 +1294,6 @@ def gdbmi_switch_thread(p, thr_id): # type: (GdbController, str) -> None
gdbmi_run_cmd_get_one_response(p, "-thread-select %s" % thr_id, "done", "result") gdbmi_run_cmd_get_one_response(p, "-thread-select %s" % thr_id, "done", "result")
def gdbmi_get_thread_info(p, thr_id=None): # type: (GdbController, typing.Optional[str]) -> dict
""" Get thread info dictionary for the given thread ID """
return gdbmi_run_cmd_get_one_response(p, "-thread-info" + (" %s" % thr_id) if thr_id else "", "done", "result")["payload"]["threads"][0]
def gdbmi_data_evaluate_expression(p, expr): # type: (GdbController, str) -> str def gdbmi_data_evaluate_expression(p, expr): # type: (GdbController, str) -> str
""" Get the value of an expression, similar to the 'print' command """ """ Get the value of an expression, similar to the 'print' command """
return gdbmi_run_cmd_get_one_response(p, "-data-evaluate-expression \"%s\"" % expr, "done", "result")["payload"]["value"] return gdbmi_run_cmd_get_one_response(p, "-data-evaluate-expression \"%s\"" % expr, "done", "result")["payload"]["value"]
@@ -1435,16 +1430,13 @@ def info_corefile(args):
print("\n======================== THREADS INFO =========================") print("\n======================== THREADS INFO =========================")
print(gdbmi_cmd_exec_console(p, "info threads")) print(gdbmi_cmd_exec_console(p, "info threads"))
# THREADS STACKS # THREADS STACKS
cur_thread, threads = gdbmi_get_thread_ids(p) threads, _ = gdbmi_get_threads(p)
for thr_id in threads: for thr in threads:
thr_id = int(thr["id"])
tcb_addr = gdb2freertos_thread_id(thr["target-id"])
task_index = int(thr_id) - 1 task_index = int(thr_id) - 1
gdbmi_switch_thread(p, thr_id)
thr_info_res = gdbmi_get_thread_info(p, thr_id)
if not thr_info_res["target-id"]:
print("WARNING: Unable to switch to thread %s\n" % thr_id)
continue
tcb_addr = gdb2freertos_thread_id(thr_info_res["target-id"])
task_name = gdbmi_freertos_get_task_name(p, tcb_addr) task_name = gdbmi_freertos_get_task_name(p, tcb_addr)
gdbmi_switch_thread(p, thr_id)
print("\n==================== THREAD %s (TCB: 0x%x, name: '%s') =====================" % (thr_id, tcb_addr, task_name)) print("\n==================== THREAD %s (TCB: 0x%x, name: '%s') =====================" % (thr_id, tcb_addr, task_name))
print(gdbmi_cmd_exec_console(p, "bt")) print(gdbmi_cmd_exec_console(p, "bt"))
if task_info and task_info[task_index].task_flags != EspCoreDumpTaskStatus.TASK_STATUS_CORRECT: if task_info and task_info[task_index].task_flags != EspCoreDumpTaskStatus.TASK_STATUS_CORRECT: