From fb6d30e013edc16cc830447a7115c0a5189f753f Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Sat, 3 Dec 2022 16:20:51 +0000 Subject: [PATCH] Tweak "Using the running image of ..." output Currently, "info files" and "info program" on a few native targets show: (gdb) info files Symbols from "/home/pedro/gdb/tests/threads". Native process: Using the running image of child Thread 0x7ffff7d89740 (LWP 1097968). ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ... (gdb) info program Using the running image of child Thread 0x7ffff7d89740 (LWP 1097968). ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Program stopped at 0x555555555278. ... This patch changes them to: (gdb) info files Symbols from "/home/pedro/gdb/tests/threads". Native process: Using the running image of child process 1097968. ^^^^^^^^^^^^^^^ ... (gdb) info program Using the running image of child process 1097968. ^^^^^^^^^^^^^^^ Program stopped at 0x555555555278. ... ... which I think makes a lot more sense in this context. The "info program" manual entry even says: "Display information about the status of your program: whether it is running or not, what process it is, and why it stopped." ^^^^^^^^^^^^^ This change affects ptrace targets, procfs targets, and Windows. Approved-By: Simon Marchi Change-Id: I6aab061ff494a84ba3398cf98fd49efd7a6ec1ca --- gdb/inf-ptrace.c | 2 +- gdb/nto-procfs.c | 2 +- gdb/procfs.c | 2 +- gdb/windows-nat.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c index a3351658705..ececf0e9498 100644 --- a/gdb/inf-ptrace.c +++ b/gdb/inf-ptrace.c @@ -522,7 +522,7 @@ inf_ptrace_target::files_info () gdb_printf (_("\tUsing the running image of %s %s.\n"), inf->attach_flag ? "attached" : "child", - target_pid_to_str (inferior_ptid).c_str ()); + target_pid_to_str (ptid_t (inf->pid)).c_str ()); } std::string diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c index ffe11c69abf..8e40efa31fc 100644 --- a/gdb/nto-procfs.c +++ b/gdb/nto-procfs.c @@ -658,7 +658,7 @@ nto_procfs_target::files_info () gdb_printf ("\tUsing the running image of %s %s via %s.\n", inf->attach_flag ? "attached" : "child", - target_pid_to_str (inferior_ptid).c_str (), + target_pid_to_str (ptid_t (inf->pid)).c_str (), (nodestr != NULL) ? nodestr : "local node"); } diff --git a/gdb/procfs.c b/gdb/procfs.c index 2c009c3e320..741e62a2402 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -2533,7 +2533,7 @@ procfs_target::files_info () gdb_printf (_("\tUsing the running image of %s %s via /proc.\n"), inf->attach_flag? "attached": "child", - target_pid_to_str (inferior_ptid).c_str ()); + target_pid_to_str (ptid_t (inf->pid)).c_str ()); } /* Make it die. Wait for it to die. Clean up after it. Note: this diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index a8ce05393b9..26ad04b27be 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -2123,7 +2123,7 @@ windows_nat_target::files_info () gdb_printf ("\tUsing the running image of %s %s.\n", inf->attach_flag ? "attached" : "child", - target_pid_to_str (inferior_ptid).c_str ()); + target_pid_to_str (ptid_t (inf->pid)).c_str ()); } /* Modify CreateProcess parameters for use of a new separate console. -- 2.30.2