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.

Change-Id: I6aab061ff494a84ba3398cf98fd49efd7a6ec1ca

diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index ab669a7acc2e9d85d1aaa10e274feef466f188ad..ade07f41ef42a3af4f7ccf6443862c426d8475bb 100644 (file)
--- 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 4a2968ea1798bc9664acd161930ad2a66f8e9c37..fe9aa8dabfa2d365fcab8a3c25173ebf6908d602 100644 (file)
--- 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 ac3d60ebf1c82de3b58ad00d05043adb7002009b..ffc26c8fb9e3cb99c887d5be2cfad79b7e080515 100644 (file)
--- 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 b3329cd1a0d0b251e6efb3cb5684f8abae788f72..ee4e78bdabf9b15a308877d07a6686317d181e7d 100644 (file)
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -2157,7 +2157,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.