diff options
Diffstat (limited to 'gdb/inferior.c')
| -rw-r--r-- | gdb/inferior.c | 78 |
1 files changed, 55 insertions, 23 deletions
diff --git a/gdb/inferior.c b/gdb/inferior.c index 0c5e2c74d4e..d732690a3cd 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -90,6 +90,8 @@ inferior::inferior (int pid_) registry_data () { inferior_alloc_data (this); + + m_target_stack.push (get_dummy_target ()); } struct inferior * @@ -276,14 +278,14 @@ find_inferior_id (int num) } struct inferior * -find_inferior_pid (int pid) +find_inferior_pid (process_stratum_target *targ, int pid) { /* Looking for inferior pid == 0 is always wrong, and indicative of a bug somewhere else. There may be more than one with pid == 0, for instance. */ gdb_assert (pid != 0); - for (inferior *inf : all_inferiors ()) + for (inferior *inf : all_inferiors (targ)) if (inf->pid == pid) return inf; @@ -293,9 +295,9 @@ find_inferior_pid (int pid) /* See inferior.h */ struct inferior * -find_inferior_ptid (ptid_t ptid) +find_inferior_ptid (process_stratum_target *targ, ptid_t ptid) { - return find_inferior_pid (ptid.pid ()); + return find_inferior_pid (targ, ptid.pid ()); } /* See inferior.h. */ @@ -340,11 +342,11 @@ have_inferiors (void) in the middle of a 'mourn' operation. */ int -number_of_live_inferiors (void) +number_of_live_inferiors (process_stratum_target *proc_target) { int num_inf = 0; - for (inferior *inf : all_non_exited_inferiors ()) + for (inferior *inf : all_non_exited_inferiors (proc_target)) if (inf->has_execution ()) for (thread_info *tp ATTRIBUTE_UNUSED : inf->non_exited_threads ()) { @@ -362,7 +364,7 @@ number_of_live_inferiors (void) int have_live_inferiors (void) { - return number_of_live_inferiors () > 0; + return number_of_live_inferiors (NULL) > 0; } /* Prune away any unused inferiors, and then prune away no longer used @@ -694,7 +696,28 @@ add_inferior_with_spaces (void) return inf; } -/* add-inferior [-copies N] [-exec FILENAME] */ +/* Switch to inferior NEW_INF, a new inferior, and unless + NO_CONNECTION is true, push the process_stratum_target of ORG_INF + to NEW_INF. */ + +static void +switch_to_inferior_and_push_target (inferior *new_inf, + bool no_connection, inferior *org_inf) +{ + process_stratum_target *proc_target = org_inf->process_target (); + + /* Switch over temporarily, while reading executable and + symbols. */ + switch_to_inferior_no_thread (new_inf); + + /* Reuse the target for new inferior. */ + if (!no_connection && proc_target != NULL) + push_target (proc_target); + + printf_filtered (_("Added inferior %d\n"), new_inf->num); +} + +/* add-inferior [-copies N] [-exec FILENAME] [-no-connection] */ static void add_inferior_command (const char *args, int from_tty) @@ -702,6 +725,7 @@ add_inferior_command (const char *args, int from_tty) int i, copies = 1; gdb::unique_xmalloc_ptr<char> exec; symfile_add_flags add_flags = 0; + bool no_connection = false; if (from_tty) add_flags |= SYMFILE_VERBOSE; @@ -721,6 +745,8 @@ add_inferior_command (const char *args, int from_tty) error (_("No argument to -copies")); copies = parse_and_eval_long (*argv); } + else if (strcmp (*argv, "-no-connection") == 0) + no_connection = true; else if (strcmp (*argv, "-exec") == 0) { ++argv; @@ -734,32 +760,32 @@ add_inferior_command (const char *args, int from_tty) } } + inferior *orginf = current_inferior (); + scoped_restore_current_pspace_and_thread restore_pspace_thread; for (i = 0; i < copies; ++i) { - struct inferior *inf = add_inferior_with_spaces (); + inferior *inf = add_inferior_with_spaces (); - printf_filtered (_("Added inferior %d\n"), inf->num); + switch_to_inferior_and_push_target (inf, no_connection, orginf); if (exec != NULL) { - /* Switch over temporarily, while reading executable and - symbols. */ - switch_to_inferior_no_thread (inf); exec_file_attach (exec.get (), from_tty); symbol_file_add_main (exec.get (), add_flags); } } } -/* clone-inferior [-copies N] [ID] */ +/* clone-inferior [-copies N] [ID] [-no-connection] */ static void clone_inferior_command (const char *args, int from_tty) { int i, copies = 1; struct inferior *orginf = NULL; + bool no_connection = false; if (args) { @@ -780,6 +806,8 @@ clone_inferior_command (const char *args, int from_tty) if (copies < 0) error (_("Invalid copies number")); } + else if (strcmp (*argv, "-no-connection") == 0) + no_connection = true; } else { @@ -825,15 +853,13 @@ clone_inferior_command (const char *args, int from_tty) inf->aspace = pspace->aspace; inf->gdbarch = orginf->gdbarch; + switch_to_inferior_and_push_target (inf, no_connection, orginf); + /* If the original inferior had a user specified target description, make the clone use it too. */ if (target_desc_info_from_user_p (inf->tdesc_info)) copy_inferior_target_desc_info (inf, orginf); - printf_filtered (_("Added inferior %d.\n"), inf->num); - - set_current_inferior (inf); - switch_to_no_thread (); clone_program_space (pspace, orginf->pspace); } } @@ -894,10 +920,13 @@ By default all inferiors are displayed.")); c = add_com ("add-inferior", no_class, add_inferior_command, _("\ Add a new inferior.\n\ -Usage: add-inferior [-copies N] [-exec FILENAME]\n\ +Usage: add-inferior [-copies N] [-exec FILENAME] [-no-connection]\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.")); +as main program.\n\ +By default, the new inferior inherits the current inferior's connection.\n\ +If -no-connection is specified, the new inferior begins with\n\ +no target connection yet.")); set_cmd_completer (c, filename_completer); add_com ("remove-inferiors", no_class, remove_inferior_command, _("\ @@ -906,11 +935,14 @@ Usage: remove-inferiors ID...")); add_com ("clone-inferior", no_class, clone_inferior_command, _("\ Clone inferior ID.\n\ -Usage: clone-inferior [-copies N] [ID]\n\ -Add N copies of inferior ID. The new inferior has the same\n\ +Usage: clone-inferior [-copies N] [-no-connection] [ID]\n\ +Add N copies of inferior ID. The new inferiors have the same\n\ executable loaded as the copied inferior. If -copies is not specified,\n\ adds 1 copy. If ID is not specified, it is the current inferior\n\ -that is cloned.")); +that is cloned.\n\ +By default, the new inferiors inherit the copied inferior's connection.\n\ +If -no-connection is specified, the new inferiors begin with\n\ +no target connection yet.")); add_cmd ("inferiors", class_run, detach_inferior_command, _("\ Detach from inferior ID (or list of IDS).\n\ |