Factor out "Detaching from program" message printing

Several targets have a copy of the same code that prints

 "Detaching from program ..."

in their target_detach implementation.  Factor that out to a common
function.

(For now, I left the couple targets that print this a bit differently
alone.  Maybe this could be further pulled out into infcmd.c.  If we
did that, and those targets want to continue printing differently,
this new function could be converted to a target method.)

gdb/ChangeLog:
2016-07-01  Pedro Alves  <palves@redhat.com>

	* darwin-nat.c (darwin_detach): Use target_announce_detach.
	* inf-ptrace.c (inf_ptrace_detach): Likewise.
	* nto-procfs.c (procfs_detach): Likewise.
	* remote.c (remote_detach_1): Likewise.
	* target.c (target_announce_detach): New function.
	* target.h (target_announce_detach): New declaration.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3f88f7b1ef166ea0b2df2bbaa89219cb4f10727c..53e3951afe6e44b8bfa4a73cd41628fcb1aa333f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2016-07-01  Pedro Alves  <palves@redhat.com>
+
+       * darwin-nat.c (darwin_detach): Use target_announce_detach.
+       * inf-ptrace.c (inf_ptrace_detach): Likewise.
+       * nto-procfs.c (procfs_detach): Likewise.
+       * remote.c (remote_detach_1): Likewise.
+       * target.c (target_announce_detach): New function.
+       * target.h (target_announce_detach): New declaration.
+
 2016-06-29  Tom Tromey  <tom@tromey.com>
 
        PR python/20129:

diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 54c430f76b773984c35c7cb591ee782d3a18e87a..590c2ad04f12ed085d8e141d6027e79c1139ad99 100644 (file)
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -1739,15 +1739,7 @@ darwin_detach (struct target_ops *ops, const char *args, int from_tty)
   int res;
 
   /* Display message.  */
-  if (from_tty)
-    {
-      char *exec_file = get_exec_file (0);
-      if (exec_file == 0)
-       exec_file = "";
-      printf_unfiltered (_("Detaching from program: %s, %s\n"), exec_file,
-                        target_pid_to_str (pid_to_ptid (pid)));
-      gdb_flush (gdb_stdout);
-    }
+  target_announce_detach (from_tty);
 
   /* If ptrace() is in use, stop the process.  */
   if (!inf->priv->no_ptrace)

diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index 329d8fb2d8c560c8d025c73ba90f138d27fa972d..dd11043a968ffc2a0f4564e3f09cebee6c584285 100644 (file)
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -240,15 +240,7 @@ inf_ptrace_detach (struct target_ops *ops, const char *args, int from_tty)
   pid_t pid = ptid_get_pid (inferior_ptid);
   int sig = 0;
 
-  if (from_tty)
-    {
-      char *exec_file = get_exec_file (0);
-      if (exec_file == 0)
-       exec_file = "";
-      printf_unfiltered (_("Detaching from program: %s, %s\n"), exec_file,
-                        target_pid_to_str (pid_to_ptid (pid)));
-      gdb_flush (gdb_stdout);
-    }
+  target_announce_detach (from_tty);
   if (args)
     sig = atoi (args);
 

diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c
index eb7dcfeb089abde9b59aee30fb50896387978765..f49453d733b27bbfd49315889825d7a7d7f7482e 100644 (file)
--- a/gdb/nto-procfs.c
+++ b/gdb/nto-procfs.c
@@ -962,15 +962,8 @@ procfs_detach (struct target_ops *ops, const char *args, int from_tty)
   int siggnal = 0;
   int pid;
 
-  if (from_tty)
-    {
-      char *exec_file = get_exec_file (0);
-      if (exec_file == 0)
-       exec_file = "";
-      printf_unfiltered ("Detaching from program: %s %s\n",
-                        exec_file, target_pid_to_str (inferior_ptid));
-      gdb_flush (gdb_stdout);
-    }
+  target_announce_detach ();
+
   if (args)
     siggnal = atoi (args);
 

diff --git a/gdb/remote.c b/gdb/remote.c
index 501f3c63bd44ba8f5ac5cef45205732c590e508a..e4b2095a40dced437613bdf22549ad58ffad6f23 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -5134,15 +5134,7 @@ remote_detach_1 (const char *args, int from_tty)
   if (!target_has_execution)
     error (_("No process to detach from."));
 
-  if (from_tty)
-    {
-      char *exec_file = get_exec_file (0);
-      if (exec_file == NULL)
-       exec_file = "";
-      printf_unfiltered (_("Detaching from program: %s, %s\n"), exec_file,
-                        target_pid_to_str (pid_to_ptid (pid)));
-      gdb_flush (gdb_stdout);
-    }
+  target_announce_detach (from_tty);
 
   /* Tell the remote target to detach.  */
   remote_detach_pid (pid);

diff --git a/gdb/target.c b/gdb/target.c
index bb86adf9b702313f999379198c9096adc967218f..d3fc35ba14571eccc0b8fb1d31d12a1db69f1e22 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -3251,6 +3251,28 @@ find_target_at (enum strata stratum)
 }
 
 \f
+
+/* See target.h  */
+
+void
+target_announce_detach (int from_tty)
+{
+  pid_t pid;
+  char *exec_file;
+
+  if (!from_tty)
+    return;
+
+  exec_file = get_exec_file (0);
+  if (exec_file == NULL)
+    exec_file = "";
+
+  pid = ptid_get_pid (inferior_ptid);
+  printf_unfiltered (_("Detaching from program: %s, %s\n"), exec_file,
+                    target_pid_to_str (pid_to_ptid (pid)));
+  gdb_flush (gdb_stdout);
+}
+
 /* The inferior process has died.  Long live the inferior!  */
 
 void

diff --git a/gdb/target.h b/gdb/target.h
index 6b5b6e0c1c671a1846008cc9d702d309f191d4c0..fc317e37d51146880d2ba303f23c978c727752d2 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -1302,6 +1302,11 @@ extern struct target_ops *find_run_target (void);
 #define target_post_attach(pid) \
      (*current_target.to_post_attach) (&current_target, pid)
 
+/* Display a message indicating we're about to detach from the current
+   inferior process.  */
+
+extern void target_announce_detach (int from_tty);
+
 /* Takes a program previously attached to and detaches it.
    The program may resume execution (some targets do, some don't) and will
    no longer stop on signals, etc.  We better not have left any breakpoints