Merge GDB 7.5.1

gdb/inferior.c

 /* Multi-process control for GDB, the GNU debugger.
 
    Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "exec.h"
 #include "inferior.h"
 #include "target.h"
 #include "command.h"
+#include "completer.h"
 #include "gdbcmd.h"
 #include "gdbthread.h"
 #include "ui-out.h"
 #include "observer.h"
 #include "gdbthread.h"
 #include "gdbcore.h"
 #include "symfile.h"
 #include "environ.h"
 #include "cli/cli-utils.h"
 #include "continuations.h"
@@ skipping 136 matching lines @@
     {
       if (arg->silent)
         delete_thread_silent (tp->ptid);
       else
         delete_thread (tp->ptid);
     }
 
   return 0;
 }
 
-void
-delete_threads_of_inferior (int pid)
-{
-  struct inferior *inf;
-  struct delete_thread_of_inferior_arg arg;
-
-  for (inf = inferior_list; inf; inf = inf->next)
-    if (inf->pid == pid)
-      break;
-
-  if (!inf)
-    return;
-
-  arg.pid = pid;
-  arg.silent = 1;
-
-  iterate_over_threads (delete_thread_of_inferior, &arg);
-}
-
 /* If SILENT then be quiet -- don't announce a inferior death, or the
    exit of its threads.  */
 
 void
 delete_inferior_1 (struct inferior *todel, int silent)
 {
   struct inferior *inf, *infprev;
   struct delete_thread_of_inferior_arg arg;
 
   infprev = NULL;
@@ skipping 59 matching lines @@
   arg.pid = inf->pid;
   arg.silent = silent;
 
   iterate_over_threads (delete_thread_of_inferior, &arg);
 
   /* Notify the observers before removing the inferior from the list,
      so that the observers have a chance to look it up.  */
   observer_notify_inferior_exit (inf);
 
   inf->pid = 0;
+  inf->fake_pid_p = 0;
   if (inf->vfork_parent != NULL)
     {
       inf->vfork_parent->vfork_child = NULL;
       inf->vfork_parent = NULL;
     }
 
   inf->has_exit_code = 0;
   inf->exit_code = 0;
 }
 
@@ skipping 229 matching lines @@
 {
   struct inferior *inf;
   int count = 0;
 
   for (inf = inferior_list; inf != NULL; inf = inf->next)
     count++;
 
   return count;
 }
 
+/* Converts an inferior process id to a string.  Like
+   target_pid_to_str, but special cases the null process.  */
+
+static char *
+inferior_pid_to_str (int pid)
+{
+  if (pid != 0)
+    return target_pid_to_str (pid_to_ptid (pid));
+  else
+    return _("<null>");
+}
+
 /* Prints the list of inferiors and their details on UIOUT.  This is a
    version of 'info_inferior_command' suitable for use from MI.
 
    If REQUESTED_INFERIORS is not NULL, it's a list of GDB ids of the
    inferiors that should be printed.  Otherwise, all inferiors are
    printed.  */
 
 static void
 print_inferior (struct ui_out *uiout, char *requested_inferiors)
 {
@@ skipping 33 matching lines @@
 
       chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
 
       if (inf == current_inferior ())
         ui_out_field_string (uiout, "current", "*");
       else
         ui_out_field_skip (uiout, "current");
 
       ui_out_field_int (uiout, "number", inf->num);
 
-      if (inf->pid)
-        ui_out_field_string (uiout, "target-id",
-                             target_pid_to_str (pid_to_ptid (inf->pid)));
-      else
-        ui_out_field_string (uiout, "target-id", "<null>");
+      ui_out_field_string (uiout, "target-id",
+                           inferior_pid_to_str (inf->pid));
 
       if (inf->pspace->ebfd)
         ui_out_field_string (uiout, "exec",
                              bfd_get_filename (inf->pspace->ebfd));
       else
         ui_out_field_skip (uiout, "exec");
 
       /* Print extra info that isn't really fit to always present in
          tabular form.  Currently we print the vfork parent/child
          relationships, if any.  */
@@ skipping 96 matching lines @@
   int num;
 
   num = parse_and_eval_long (args);
 
   inf = find_inferior_id (num);
   if (inf == NULL)
     error (_("Inferior ID %d not known."), num);
 
   printf_filtered (_("[Switching to inferior %d [%s] (%s)]\n"),
                    inf->num,
-                   target_pid_to_str (pid_to_ptid (inf->pid)),
+                   inferior_pid_to_str (inf->pid),
                    (inf->pspace->ebfd
                     ? bfd_get_filename (inf->pspace->ebfd)
                     : _("<noexec>")));
 
   if (inf->pid != 0)
     {
       if (inf->pid != ptid_get_pid (inferior_ptid))
         {
           struct thread_info *tp;
 
@@ skipping 30 matching lines @@
 /* Print information about currently known inferiors.  */
 
 static void
 info_inferiors_command (char *args, int from_tty)
 {
   print_inferior (current_uiout, args);
 }
 
 /* remove-inferior ID */
 
-void
+static void
 remove_inferior_command (char *args, int from_tty)
 {
   int num;
   struct inferior *inf;
   struct get_number_or_range_state state;
 
   if (args == NULL || *args == '\0')
     error (_("Requires an argument (inferior id(s) to remove)"));
 
   init_number_or_range (&state, args);
@@ skipping 38 matching lines @@
   pspace = add_program_space (aspace);
   inf = add_inferior (0);
   inf->pspace = pspace;
   inf->aspace = pspace->aspace;
 
   return inf;
 }
 
 /* add-inferior [-copies N] [-exec FILENAME]  */
 
-void
+static void
 add_inferior_command (char *args, int from_tty)
 {
   int i, copies = 1;
   char *exec = NULL;
   char **argv;
   struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
 
   if (args)
     {
       argv = gdb_buildargv (args);
@@ skipping 42 matching lines @@
           exec_file_attach (exec, from_tty);
           symbol_file_add_main (exec, from_tty);
         }
     }
 
   do_cleanups (old_chain);
 }
 
 /* clone-inferior [-copies N] [ID] */
 
-void
+static void
 clone_inferior_command (char *args, int from_tty)
 {
   int i, copies = 1;
   char **argv;
   struct inferior *orginf = NULL;
   struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
 
   if (args)
     {
       argv = gdb_buildargv (args);
@@ skipping 169 matching lines @@
   gdb_assert (data->index < inf->num_data);
   inf->data[data->index] = value;
 }
 
 void *
 inferior_data (struct inferior *inf, const struct inferior_data *data)
 {
   gdb_assert (data->index < inf->num_data);
   return inf->data[data->index];
 }