X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Finferior.c;h=2f4ced0788d5cb32260bf51c8112925401c128f0;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=3969ace13a848a411b6944ef45cf9cbfe0f7fcf8;hpb=5018ce90c1205d79f29adf954b0fd5e613d08430;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/inferior.c b/gdb/inferior.c index 3969ace13a..2f4ced0788 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 * @@ -160,7 +162,7 @@ delete_inferior (struct inferior *todel) /* If this program space is rendered useless, remove it. */ if (program_space_empty_p (inf->pspace)) - delete_program_space (inf->pspace); + delete inf->pspace; delete inf; } @@ -258,13 +260,6 @@ inferior_appeared (struct inferior *inf, int pid) gdb::observers::inferior_appeared.notify (inf); } -void -discard_all_inferiors (void) -{ - for (inferior *inf : all_non_exited_inferiors ()) - exit_inferior_silent (inf); -} - struct inferior * find_inferior_id (int num) { @@ -276,14 +271,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 +288,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. */ @@ -315,17 +310,6 @@ find_inferior_for_program_space (struct program_space *pspace) return NULL; } -struct inferior * -iterate_over_inferiors (int (*callback) (struct inferior *, void *), - void *data) -{ - for (inferior *inf : all_inferiors_safe ()) - if ((*callback) (inf, data)) - return inf; - - return NULL; -} - int have_inferiors (void) { @@ -340,11 +324,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 +346,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 @@ -426,6 +410,31 @@ print_selected_inferior (struct ui_out *uiout) inf->num, inferior_pid_to_str (inf->pid).c_str (), filename); } +/* Helper for print_inferior. Returns the 'connection-id' string for + PROC_TARGET. */ + +static std::string +uiout_field_connection (process_stratum_target *proc_target) +{ + if (proc_target == NULL) + { + return {}; + } + else if (proc_target->connection_string () != NULL) + { + return string_printf ("%d (%s %s)", + proc_target->connection_number, + proc_target->shortname (), + proc_target->connection_string ()); + } + else + { + return string_printf ("%d (%s)", + proc_target->connection_number, + proc_target->shortname ()); + } +} + /* Prints the list of inferiors and their details on UIOUT. This is a version of 'info_inferior_command' suitable for use from MI. @@ -437,6 +446,7 @@ static void print_inferior (struct ui_out *uiout, const char *requested_inferiors) { int inf_count = 0; + size_t connection_id_len = 20; /* Compute number of inferiors we will print. */ for (inferior *inf : all_inferiors ()) @@ -444,6 +454,10 @@ print_inferior (struct ui_out *uiout, const char *requested_inferiors) if (!number_is_in_list (requested_inferiors, inf->num)) continue; + std::string conn = uiout_field_connection (inf->process_target ()); + if (connection_id_len < conn.size ()) + connection_id_len = conn.size (); + ++inf_count; } @@ -453,13 +467,20 @@ print_inferior (struct ui_out *uiout, const char *requested_inferiors) return; } - ui_out_emit_table table_emitter (uiout, 4, inf_count, "inferiors"); + ui_out_emit_table table_emitter (uiout, 5, inf_count, "inferiors"); uiout->table_header (1, ui_left, "current", ""); uiout->table_header (4, ui_left, "number", "Num"); uiout->table_header (17, ui_left, "target-id", "Description"); + uiout->table_header (connection_id_len, ui_left, + "connection-id", "Connection"); uiout->table_header (17, ui_left, "exec", "Executable"); uiout->table_body (); + + /* Restore the current thread after the loop because we switch the + inferior in the loop. */ + scoped_restore_current_pspace_and_thread restore_pspace_thread; + inferior *current_inf = current_inferior (); for (inferior *inf : all_inferiors ()) { if (!number_is_in_list (requested_inferiors, inf->num)) @@ -467,15 +488,22 @@ print_inferior (struct ui_out *uiout, const char *requested_inferiors) ui_out_emit_tuple tuple_emitter (uiout, NULL); - if (inf == current_inferior ()) + if (inf == current_inf) uiout->field_string ("current", "*"); else uiout->field_skip ("current"); uiout->field_signed ("number", inf->num); + /* Because target_pid_to_str uses current_top_target, + switch the inferior. */ + switch_to_inferior_no_thread (inf); + uiout->field_string ("target-id", inferior_pid_to_str (inf->pid)); + std::string conn = uiout_field_connection (inf->process_target ()); + uiout->field_string ("connection-id", conn.c_str ()); + if (inf->pspace->pspace_exec_filename != NULL) uiout->field_string ("exec", inf->pspace->pspace_exec_filename); else @@ -575,6 +603,16 @@ kill_inferior_command (const char *args, int from_tty) bfd_cache_close_all (); } +/* See inferior.h. */ + +void +switch_to_inferior_no_thread (inferior *inf) +{ + set_current_inferior (inf); + switch_to_no_thread (); + set_current_program_space (inf->pspace); +} + static void inferior_command (const char *args, int from_tty) { @@ -605,9 +643,7 @@ inferior_command (const char *args, int from_tty) } else { - set_current_inferior (inf); - switch_to_no_thread (); - set_current_program_space (inf->pspace); + switch_to_inferior_no_thread (inf); gdb::observers::user_selected_context_changed.notify (USER_SELECTED_INFERIOR); @@ -686,7 +722,41 @@ 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); + if (proc_target->connection_string () != NULL) + printf_filtered (_("Added inferior %d on connection %d (%s %s)\n"), + new_inf->num, + proc_target->connection_number, + proc_target->shortname (), + proc_target->connection_string ()); + else + printf_filtered (_("Added inferior %d on connection %d (%s)\n"), + new_inf->num, + proc_target->connection_number, + proc_target->shortname ()); + } + else + 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) @@ -694,6 +764,7 @@ add_inferior_command (const char *args, int from_tty) int i, copies = 1; gdb::unique_xmalloc_ptr exec; symfile_add_flags add_flags = 0; + bool no_connection = false; if (from_tty) add_flags |= SYMFILE_VERBOSE; @@ -713,6 +784,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; @@ -726,35 +799,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.q. */ - set_current_program_space (inf->pspace); - set_current_inferior (inf); - switch_to_no_thread (); - 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) { @@ -775,6 +845,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 { @@ -820,15 +892,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); } } @@ -889,10 +959,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, _("\ @@ -901,11 +974,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\