/* Multi-process control for GDB, the GNU debugger.
- Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2008-2012 Free Software Foundation, Inc.
This file is part of GDB.
#include "gdbthread.h"
#include "gdbcore.h"
#include "symfile.h"
+#include "environ.h"
+#include "cli/cli-utils.h"
+#include "continuations.h"
void _initialize_inferiors (void);
restore_inferior (void *arg)
{
struct inferior *saved_inferior = arg;
+
set_current_inferior (saved_inferior);
}
{
struct cleanup *old_chain = make_cleanup (restore_inferior,
current_inferior_);
+
return old_chain;
}
{
discard_all_inferior_continuations (inf);
inferior_free_data (inf);
+ xfree (inf->args);
+ xfree (inf->terminal);
+ free_environ (inf->environment);
xfree (inf->private);
xfree (inf);
}
memset (inf, 0, sizeof (*inf));
inf->pid = pid;
- inf->stop_soon = NO_STOP_QUIETLY;
+ inf->control.stop_soon = NO_STOP_QUIETLY;
inf->num = ++highest_inferior_num;
inf->next = inferior_list;
inferior_list = inf;
+ inf->environment = make_environ ();
+ init_environ (inf->environment);
+
inferior_alloc_data (inf);
+ observer_notify_inferior_added (inf);
+
if (pid != 0)
inferior_appeared (inf, pid);
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. */
-static void
+void
delete_inferior_1 (struct inferior *todel, int silent)
{
struct inferior *inf, *infprev;
else
inferior_list = inf->next;
+ observer_notify_inferior_removed (inf);
+
free_inferior (inf);
}
/* 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->pid);
+ 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;
}
void
exit_inferior (int pid)
{
struct inferior *inf = find_inferior_pid (pid);
+
exit_inferior_1 (inf, 0);
if (print_inferior_events)
exit_inferior_silent (int pid)
{
struct inferior *inf = find_inferior_pid (pid);
+
exit_inferior_1 (inf, 1);
}
detach_inferior (int pid)
{
struct inferior *inf = find_inferior_pid (pid);
+
exit_inferior_1 (inf, 1);
if (print_inferior_events)
{
inf->pid = pid;
- observer_notify_inferior_appeared (pid);
+ observer_notify_inferior_appeared (inf);
}
void
int
have_live_inferiors (void)
{
- struct target_ops *t;
-
- /* The check on stratum suffices, as GDB doesn't currently support
- multiple target interfaces. */
- if (have_inferiors ())
- for (t = current_target.beneath; t != NULL; t = t->beneath)
- if (t->to_stratum == process_stratum)
- return 1;
+ struct inferior *inf;
- return 0;
+ for (inf = inferior_list; inf; inf = inf->next)
+ if (inf->pid != 0)
+ {
+ struct thread_info *tp;
+
+ tp = any_thread_of_process (inf->pid);
+ if (tp && target_has_execution_1 (tp->ptid))
+ break;
+ }
+
+ return inf != NULL;
}
/* Prune away automatically added program spaces that aren't required
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_INFERIOR is not -1, it's the GDB id of the inferior that
- should be printed. Otherwise, all inferiors are printed. */
-void
-print_inferior (struct ui_out *uiout, int requested_inferior)
+ 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)
{
struct inferior *inf;
struct cleanup *old_chain;
/* Compute number of inferiors we will print. */
for (inf = inferior_list; inf; inf = inf->next)
{
- struct cleanup *chain2;
-
- if (requested_inferior != -1 && inf->num != requested_inferior)
+ if (!number_is_in_list (requested_inferiors, inf->num))
continue;
++inf_count;
{
struct cleanup *chain2;
- if (requested_inferior != -1 && inf->num != requested_inferior)
+ if (!number_is_in_list (requested_inferiors, inf->num))
continue;
chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
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",
{
int num, pid;
struct thread_info *tp;
+ struct get_number_or_range_state state;
if (!args || !*args)
- error (_("Requires argument (inferior id to detach)"));
+ error (_("Requires argument (inferior id(s) to detach)"));
- num = parse_and_eval_long (args);
+ init_number_or_range (&state, args);
+ while (!state.finished)
+ {
+ num = get_number_or_range (&state);
- if (!valid_gdb_inferior_id (num))
- error (_("Inferior ID %d not known."), num);
+ if (!valid_gdb_inferior_id (num))
+ {
+ warning (_("Inferior ID %d not known."), num);
+ continue;
+ }
- pid = gdb_inferior_id_to_pid (num);
+ pid = gdb_inferior_id_to_pid (num);
- tp = any_thread_of_process (pid);
- if (!tp)
- error (_("Inferior has no threads."));
+ tp = any_thread_of_process (pid);
+ if (!tp)
+ {
+ warning (_("Inferior ID %d has no threads."), num);
+ continue;
+ }
- switch_to_thread (tp->ptid);
+ switch_to_thread (tp->ptid);
- detach_command (NULL, from_tty);
+ detach_command (NULL, from_tty);
+ }
}
static void
{
int num, pid;
struct thread_info *tp;
+ struct get_number_or_range_state state;
if (!args || !*args)
- error (_("Requires argument (inferior id to kill)"));
+ error (_("Requires argument (inferior id(s) to kill)"));
- num = parse_and_eval_long (args);
+ init_number_or_range (&state, args);
+ while (!state.finished)
+ {
+ num = get_number_or_range (&state);
- if (!valid_gdb_inferior_id (num))
- error (_("Inferior ID %d not known."), num);
+ if (!valid_gdb_inferior_id (num))
+ {
+ warning (_("Inferior ID %d not known."), num);
+ continue;
+ }
- pid = gdb_inferior_id_to_pid (num);
+ pid = gdb_inferior_id_to_pid (num);
- tp = any_thread_of_process (pid);
- if (!tp)
- error (_("Inferior has no threads."));
+ tp = any_thread_of_process (pid);
+ if (!tp)
+ {
+ warning (_("Inferior ID %d has no threads."), num);
+ continue;
+ }
- switch_to_thread (tp->ptid);
+ switch_to_thread (tp->ptid);
- target_kill ();
+ target_kill ();
+ }
bfd_cache_close_all ();
}
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 && is_running (inferior_ptid))
- ui_out_text (uiout, "(running)\n");
+ ui_out_text (current_uiout, "(running)\n");
else if (inf->pid != 0)
{
- ui_out_text (uiout, "\n");
+ ui_out_text (current_uiout, "\n");
print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC);
}
}
static void
info_inferiors_command (char *args, int from_tty)
{
- int requested = -1;
-
- if (args && *args)
- {
- requested = parse_and_eval_long (args);
- if (!valid_gdb_inferior_id (requested))
- error (_("Inferior ID %d not known."), requested);
- }
-
- print_inferior (uiout, requested);
+ 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;
- num = parse_and_eval_long (args);
- inf = find_inferior_id (num);
+ if (args == NULL || *args == '\0')
+ error (_("Requires an argument (inferior id(s) to remove)"));
- if (inf == NULL)
- error (_("Inferior ID %d not known."), num);
+ init_number_or_range (&state, args);
+ while (!state.finished)
+ {
+ num = get_number_or_range (&state);
+ inf = find_inferior_id (num);
- if (inf == current_inferior ())
- error (_("Can not remove current symbol inferior."));
+ if (inf == NULL)
+ {
+ warning (_("Inferior ID %d not known."), num);
+ continue;
+ }
- delete_inferior_1 (inf, 1);
+ if (inf == current_inferior ())
+ {
+ warning (_("Can not remove current symbol inferior %d."), num);
+ continue;
+ }
+
+ if (inf->pid != 0)
+ {
+ warning (_("Can not remove active inferior %d."), num);
+ continue;
+ }
+
+ delete_inferior_1 (inf, 1);
+ }
}
+struct inferior *
+add_inferior_with_spaces (void)
+{
+ struct address_space *aspace;
+ struct program_space *pspace;
+ struct inferior *inf;
+
+ /* If all inferiors share an address space on this system, this
+ doesn't really return a new address space; otherwise, it
+ really does. */
+ aspace = maybe_new_address_space ();
+ 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;
for (i = 0; i < copies; ++i)
{
- struct address_space *aspace;
- struct program_space *pspace;
- struct inferior *inf;
-
- /* If all inferiors share an address space on this system, this
- doesn't really return a new address space; otherwise, it
- really does. */
- aspace = maybe_new_address_space ();
- pspace = add_program_space (aspace);
- inf = add_inferior (0);
- inf->pspace = pspace;
- inf->aspace = pspace->aspace;
+ struct inferior *inf = add_inferior_with_spaces ();
printf_filtered (_("Added inferior %d\n"), inf->num);
if (exec != NULL)
{
/* Switch over temporarily, while reading executable and
- symbols.q */
- set_current_program_space (pspace);
+ symbols.q. */
+ set_current_program_space (inf->pspace);
set_current_inferior (inf);
switch_to_thread (null_ptid);
/* clone-inferior [-copies N] [ID] */
-void
+static void
clone_inferior_command (char *args, int from_tty)
{
int i, copies = 1;
current_inferior_->pspace = current_program_space;
current_inferior_->aspace = current_program_space->aspace;
- add_info ("inferiors", info_inferiors_command,
- _("IDs of currently known inferiors."));
+ add_info ("inferiors", info_inferiors_command,
+ _("IDs of specified inferiors (all inferiors if no argument)."));
add_com ("add-inferior", no_class, add_inferior_command, _("\
Add a new inferior.\n\
Usage: add-inferior [-copies <N>] [-exec <FILENAME>]\n\
-N is the optional number of inferior to add, default is 1.\n\
+N is the optional number of inferiors to add, default is 1.\n\
FILENAME is the file name of the executable to use\n\
as main program."));
- add_com ("remove-inferior", no_class, remove_inferior_command, _("\
-Remove inferior ID.\n\
-Usage: remove-inferior ID"));
+ add_com ("remove-inferiors", no_class, remove_inferior_command, _("\
+Remove inferior ID (or list of IDs).\n\
+Usage: remove-inferiors ID..."));
add_com ("clone-inferior", no_class, clone_inferior_command, _("\
Clone inferior ID.\n\
adds 1 copy. If ID is not specified, it is the current inferior\n\
that is cloned."));
- add_cmd ("inferior", class_run, detach_inferior_command, _("\
-Detach from inferior ID."),
+ add_cmd ("inferiors", class_run, detach_inferior_command, _("\
+Detach from inferior ID (or list of IDS)."),
&detachlist);
- add_cmd ("inferior", class_run, kill_inferior_command, _("\
-Kill inferior ID."),
+ add_cmd ("inferiors", class_run, kill_inferior_command, _("\
+Kill inferior ID (or list of IDs)."),
&killlist);
add_cmd ("inferior", class_run, inferior_command, _("\
projects / deliverable / binutils-gdb.git / blobdiff