/* Multi-process control for GDB, the GNU debugger.
- Copyright (C) 2008-2020 Free Software Foundation, Inc.
+ Copyright (C) 2008-2021 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"
DEFINE_REGISTRY (inferior, REGISTRY_ACCESS_FIELD)
-struct inferior *inferior_list = NULL;
+intrusive_list<inferior> inferior_list;
static int highest_inferior_num;
/* See inferior.h. */
/* The Current Inferior. This is a strong reference. I.e., whenever
an inferior is the current inferior, its refcount is
incremented. */
-static struct inferior *current_inferior_ = NULL;
+static inferior_ref current_inferior_;
struct inferior*
current_inferior (void)
{
- return current_inferior_;
+ return current_inferior_.get ();
}
void
/* There's always an inferior. */
gdb_assert (inf != NULL);
- inf->incref ();
- current_inferior_->decref ();
- current_inferior_ = inf;
+ current_inferior_ = inferior_ref::new_reference (inf);
}
private_inferior::~private_inferior () = default;
{
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);
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)
+ {
+ 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);
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 ());
struct inferior *inf;
int num;
- num = parse_and_eval_long (args);
-
- inf = find_inferior_id (num);
- if (inf == NULL)
- error (_("Inferior ID %d not known."), num);
-
- if (inf->pid != 0)
+ if (args == nullptr)
{
- if (inf != current_inferior ())
- {
- thread_info *tp = any_thread_of_inferior (inf);
- if (tp == NULL)
- error (_("Inferior has no threads."));
+ inf = current_inferior ();
+ gdb_assert (inf != nullptr);
+ const char *filename = inf->pspace->exec_filename.get ();
- switch_to_thread (tp);
- }
+ if (filename == nullptr)
+ filename = _("<noexec>");
- gdb::observers::user_selected_context_changed.notify
- (USER_SELECTED_INFERIOR
- | USER_SELECTED_THREAD
- | USER_SELECTED_FRAME);
+ printf_filtered (_("[Current inferior is %d [%s] (%s)]\n"),
+ inf->num, inferior_pid_to_str (inf->pid).c_str (),
+ filename);
}
else
{
- switch_to_inferior_no_thread (inf);
+ num = parse_and_eval_long (args);
+
+ inf = find_inferior_id (num);
+ if (inf == NULL)
+ error (_("Inferior ID %d not known."), num);
+
+ if (inf->pid != 0)
+ {
+ if (inf != current_inferior ())
+ {
+ thread_info *tp = any_thread_of_inferior (inf);
+ if (tp == NULL)
+ error (_("Inferior has no threads."));
+
+ switch_to_thread (tp);
+ }
+
+ gdb::observers::user_selected_context_changed.notify
+ (USER_SELECTED_INFERIOR
+ | USER_SELECTED_THREAD
+ | USER_SELECTED_FRAME);
+ }
+ else
+ {
+ switch_to_inferior_no_thread (inf);
- gdb::observers::user_selected_context_changed.notify
- (USER_SELECTED_INFERIOR);
+ gdb::observers::user_selected_context_changed.notify
+ (USER_SELECTED_INFERIOR);
+ }
}
}
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. */
/* Reuse the target for new inferior. */
if (!no_connection && proc_target != NULL)
{
- push_target (proc_target);
+ 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,
can only allocate an inferior when all those modules have done
that. Do this after initialize_progspace, due to the
current_program_space reference. */
- current_inferior_ = add_inferior_silent (0);
- current_inferior_->incref ();
+ set_current_inferior (add_inferior_silent (0));
current_inferior_->pspace = current_program_space;
current_inferior_->aspace = current_program_space->aspace;
/* The architecture will be initialized shortly, by
&cmdlist);
add_setshow_boolean_cmd ("inferior-events", no_class,
- &print_inferior_events, _("\
+ &print_inferior_events, _("\
Set printing of inferior events (such as inferior start and exit)."), _("\
Show printing of inferior events (such as inferior start and exit)."), NULL,
- NULL,
- show_print_inferior_events,
- &setprintlist, &showprintlist);
+ NULL,
+ show_print_inferior_events,
+ &setprintlist, &showprintlist);
create_internalvar_type_lazy ("_inferior", &inferior_funcs, NULL);
}
projects / binutils-gdb.git / blobdiff