/* Multi-process control for GDB, the GNU debugger.
- Copyright (C) 2008-2021 Free Software Foundation, Inc.
+ Copyright (C) 2008-2022 Free Software Foundation, Inc.
This file is part of GDB.
#include "symfile.h"
#include "gdbsupport/environ.h"
#include "cli/cli-utils.h"
-#include "continuations.h"
#include "arch-utils.h"
#include "target-descriptions.h"
#include "readline/tilde.h"
#include "progspace-and-thread.h"
+#include "gdbsupport/buildargv.h"
+#include "cli/cli-style.h"
/* Keep a registry of per-inferior data-pointers required by other GDB
modules. */
DEFINE_REGISTRY (inferior, REGISTRY_ACCESS_FIELD)
-struct inferior *inferior_list = NULL;
+intrusive_list<inferior> inferior_list;
static int highest_inferior_num;
/* See inferior.h. */
{
inferior *inf = this;
- discard_all_inferior_continuations (inf);
+ m_continuations.clear ();
inferior_free_data (inf);
- xfree (inf->args);
target_desc_info_free (inf->tdesc_info);
}
m_target_stack.push (get_dummy_target ());
}
+/* See inferior.h. */
+
+int
+inferior::unpush_target (struct target_ops *t)
+{
+ /* If unpushing the process stratum target from the inferior while threads
+ exist in the inferior, ensure that we don't leave any threads of the
+ inferior in the target's "resumed with pending wait status" list.
+
+ See also the comment in set_thread_exited. */
+ if (t->stratum () == process_stratum)
+ {
+ process_stratum_target *proc_target = as_process_stratum_target (t);
+
+ for (thread_info *thread : this->non_exited_threads ())
+ proc_target->maybe_remove_resumed_with_pending_wait_status (thread);
+ }
+
+ return m_target_stack.unpush (t);
+}
+
void
-inferior::set_tty (const char *terminal_name)
+inferior::set_tty (std::string terminal_name)
{
- if (terminal_name != nullptr && *terminal_name != '\0')
- m_terminal = make_unique_xstrdup (terminal_name);
- else
- m_terminal = NULL;
+ m_terminal = std::move (terminal_name);
}
-const char *
+const std::string &
inferior::tty ()
{
- return m_terminal.get ();
+ return m_terminal;
+}
+
+void
+inferior::add_continuation (std::function<void ()> &&cont)
+{
+ m_continuations.emplace_front (std::move (cont));
+}
+
+void
+inferior::do_all_continuations ()
+{
+ while (!m_continuations.empty ())
+ {
+ auto iter = m_continuations.begin ();
+ (*iter) ();
+ m_continuations.erase (iter);
+ }
}
struct inferior *
{
inferior *inf = new inferior (pid);
- if (inferior_list == NULL)
- inferior_list = inf;
- else
- {
- inferior *last;
-
- for (last = inferior_list; last->next != NULL; last = last->next)
- ;
- last->next = inf;
- }
+ inferior_list.push_back (*inf);
gdb::observers::inferior_added.notify (inf);
if (print_inferior_events)
{
if (pid != 0)
- printf_unfiltered (_("[New inferior %d (%s)]\n"),
- inf->num,
- target_pid_to_str (ptid_t (pid)).c_str ());
+ gdb_printf (_("[New inferior %d (%s)]\n"),
+ inf->num,
+ target_pid_to_str (ptid_t (pid)).c_str ());
else
- printf_unfiltered (_("[New inferior %d]\n"), inf->num);
+ gdb_printf (_("[New inferior %d]\n"), inf->num);
}
return inf;
}
+/* See inferior.h. */
+
void
-delete_inferior (struct inferior *todel)
+inferior::clear_thread_list (bool silent)
{
- struct inferior *inf, *infprev;
-
- infprev = NULL;
-
- for (inf = inferior_list; inf; infprev = inf, inf = inf->next)
- if (inf == todel)
- break;
-
- if (!inf)
- return;
+ thread_list.clear_and_dispose ([=] (thread_info *thr)
+ {
+ threads_debug_printf ("deleting thread %s, silent = %d",
+ thr->ptid.to_string ().c_str (), silent);
+ set_thread_exited (thr, silent);
+ if (thr->deletable ())
+ delete thr;
+ });
+ ptid_thread_map.clear ();
+}
- for (thread_info *tp : inf->threads_safe ())
- delete_thread_silent (tp);
+void
+delete_inferior (struct inferior *inf)
+{
+ inf->clear_thread_list (true);
- if (infprev)
- infprev->next = inf->next;
- else
- inferior_list = inf->next;
+ auto it = inferior_list.iterator_to (*inf);
+ inferior_list.erase (it);
gdb::observers::inferior_removed.notify (inf);
exit of its threads. */
static void
-exit_inferior_1 (struct inferior *inftoex, int silent)
+exit_inferior_1 (struct inferior *inf, int silent)
{
- struct inferior *inf;
-
- for (inf = inferior_list; inf; inf = inf->next)
- if (inf == inftoex)
- break;
-
- if (!inf)
- return;
-
- for (thread_info *tp : inf->threads_safe ())
- {
- if (silent)
- delete_thread_silent (tp);
- else
- delete_thread (tp);
- }
+ inf->clear_thread_list (silent);
gdb::observers::inferior_exit.notify (inf);
exit_inferior_1 (inf, 0);
if (print_inferior_events)
- printf_unfiltered (_("[Inferior %d (%s) detached]\n"),
- inf->num,
- target_pid_to_str (ptid_t (pid)).c_str ());
+ gdb_printf (_("[Inferior %d (%s) detached]\n"),
+ inf->num,
+ target_pid_to_str (ptid_t (pid)).c_str ());
}
void
void
prune_inferiors (void)
{
- inferior *ss;
-
- ss = inferior_list;
- while (ss)
+ for (inferior *inf : all_inferiors_safe ())
{
- if (!ss->deletable ()
- || !ss->removable
- || ss->pid != 0)
- {
- ss = ss->next;
- continue;
- }
+ if (!inf->deletable ()
+ || !inf->removable
+ || inf->pid != 0)
+ continue;
- inferior *ss_next = ss->next;
- delete_inferior (ss);
- ss = ss_next;
+ delete_inferior (inf);
}
}
uiout->field_signed ("number", inf->num);
- /* Because target_pid_to_str uses current_top_target,
+ /* Because target_pid_to_str uses the current inferior,
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 ());
+ uiout->field_string ("connection-id", conn);
if (inf->pspace->exec_filename != nullptr)
- uiout->field_string ("exec", inf->pspace->exec_filename.get ());
+ uiout->field_string ("exec", inf->pspace->exec_filename.get (),
+ file_name_style.style ());
else
uiout->field_skip ("exec");
if (filename == nullptr)
filename = _("<noexec>");
- printf_filtered (_("[Current inferior is %d [%s] (%s)]\n"),
- inf->num, inferior_pid_to_str (inf->pid).c_str (),
- filename);
+ gdb_printf (_("[Current inferior is %d [%s] (%s)]\n"),
+ inf->num, inferior_pid_to_str (inf->pid).c_str (),
+ filename);
}
else
{
struct address_space *aspace;
struct program_space *pspace;
struct inferior *inf;
- struct gdbarch_info info;
/* If all inferiors share an address space on this system, this
doesn't really return a new address space; otherwise, it
/* Setup the inferior's initial arch, based on information obtained
from the global "set ..." options. */
- gdbarch_info_init (&info);
+ gdbarch_info info;
inf->gdbarch = gdbarch_find_by_info (info);
/* The "set ..." options reject invalid settings, so we should
always have a valid arch by now. */
return inf;
}
-/* 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. */
+/* See inferior.h. */
-static void
+void
switch_to_inferior_and_push_target (inferior *new_inf,
bool no_connection, inferior *org_inf)
{
{
new_inf->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 ());
+ gdb_printf (_("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 ());
+ gdb_printf (_("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);
+ gdb_printf (_("Added inferior %d\n"), new_inf->num);
}
/* add-inferior [-copies N] [-exec FILENAME] [-no-connection] */
copy_inferior_target_desc_info (inf, orginf);
clone_program_space (pspace, orginf->pspace);
+
+ /* Copy properties from the original inferior to the new one. */
+ inf->set_args (orginf->args ());
+ inf->set_cwd (orginf->cwd ());
+ inf->set_tty (orginf->tty ());
+ for (const std::string &set_var : orginf->environment.user_set_env ())
+ {
+ /* set_var has the form NAME=value. Split on the first '='. */
+ const std::string::size_type pos = set_var.find ('=');
+ gdb_assert (pos != std::string::npos);
+ const std::string varname = set_var.substr (0, pos);
+ inf->environment.set
+ (varname.c_str (), orginf->environment.get (varname.c_str ()));
+ }
+ for (const std::string &unset_var
+ : orginf->environment.user_unset_env ())
+ inf->environment.unset (unset_var.c_str ());
}
}
show_print_inferior_events (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("Printing of inferior events is %s.\n"), value);
+ gdb_printf (file, _("Printing of inferior events is %s.\n"), value);
}
/* Return a new value for the selected inferior's id. */
{
inferior_id_make_value,
NULL,
- NULL
};
\f
projects / binutils-gdb.git / blobdiff