/* Multi-process control for GDB, the GNU debugger.
- Copyright (C) 2008-2018 Free Software Foundation, Inc.
+ Copyright (C) 2008-2019 Free Software Foundation, Inc.
This file is part of GDB.
#include "observable.h"
#include "gdbcore.h"
#include "symfile.h"
-#include "environ.h"
+#include "gdbsupport/environ.h"
#include "cli/cli-utils.h"
#include "continuations.h"
#include "arch-utils.h"
static int highest_inferior_num;
/* See inferior.h. */
-int print_inferior_events = 1;
+bool print_inferior_events = true;
/* The Current Inferior. This is a strong reference. I.e., whenever
an inferior is the current inferior, its refcount is
struct inferior *inf = add_inferior_silent (pid);
if (print_inferior_events)
- printf_unfiltered (_("[New inferior %d (%s)]\n"),
- inf->num,
- target_pid_to_str (ptid_t (pid)));
-
- return inf;
-}
-
-struct delete_thread_of_inferior_arg
-{
- int pid;
- int silent;
-};
-
-static int
-delete_thread_of_inferior (struct thread_info *tp, void *data)
-{
- struct delete_thread_of_inferior_arg *arg
- = (struct delete_thread_of_inferior_arg *) data;
-
- if (tp->ptid.pid () == arg->pid)
{
- if (arg->silent)
- delete_thread_silent (tp);
+ if (pid != 0)
+ printf_unfiltered (_("[New inferior %d (%s)]\n"),
+ inf->num,
+ target_pid_to_str (ptid_t (pid)).c_str ());
else
- delete_thread (tp);
+ printf_unfiltered (_("[New inferior %d]\n"), inf->num);
}
- return 0;
+ return inf;
}
void
delete_inferior (struct inferior *todel)
{
struct inferior *inf, *infprev;
- struct delete_thread_of_inferior_arg arg;
infprev = NULL;
if (!inf)
return;
- arg.pid = inf->pid;
- arg.silent = 1;
-
- iterate_over_threads (delete_thread_of_inferior, &arg);
+ for (thread_info *tp : inf->threads_safe ())
+ delete_thread_silent (tp);
if (infprev)
infprev->next = inf->next;
exit_inferior_1 (struct inferior *inftoex, int silent)
{
struct inferior *inf;
- struct delete_thread_of_inferior_arg arg;
for (inf = inferior_list; inf; inf = inf->next)
if (inf == inftoex)
if (!inf)
return;
- arg.pid = inf->pid;
- arg.silent = silent;
-
- iterate_over_threads (delete_thread_of_inferior, &arg);
+ for (thread_info *tp : inf->threads_safe ())
+ {
+ if (silent)
+ delete_thread_silent (tp);
+ else
+ delete_thread (tp);
+ }
gdb::observers::inferior_exit.notify (inf);
inf->pid = 0;
- inf->fake_pid_p = 0;
+ inf->fake_pid_p = false;
inf->priv = NULL;
if (inf->vfork_parent != NULL)
inf->pending_detach = 0;
/* Reset it. */
- inf->control = {NO_STOP_QUIETLY};
+ inf->control = inferior_control_state (NO_STOP_QUIETLY);
+
+ /* Clear the register cache and the frame cache. */
+ registers_changed ();
+ reinit_frame_cache ();
}
void
if (print_inferior_events)
printf_unfiltered (_("[Inferior %d (%s) detached]\n"),
inf->num,
- target_pid_to_str (ptid_t (pid)));
+ target_pid_to_str (ptid_t (pid)).c_str ());
}
void
inferior_appeared (struct inferior *inf, int pid)
{
+ /* If this is the first inferior with threads, reset the global
+ thread id. */
+ if (!any_thread_p ())
+ init_thread_list ();
+
inf->pid = pid;
inf->has_exit_code = 0;
inf->exit_code = 0;
void
discard_all_inferiors (void)
{
- struct inferior *inf;
-
- for (inf = inferior_list; inf; inf = inf->next)
- {
- if (inf->pid != 0)
- exit_inferior_silent (inf);
- }
+ for (inferior *inf : all_non_exited_inferiors ())
+ exit_inferior_silent (inf);
}
struct inferior *
find_inferior_id (int num)
{
- struct inferior *inf;
-
- for (inf = inferior_list; inf; inf = inf->next)
+ for (inferior *inf : all_inferiors ())
if (inf->num == num)
return inf;
struct inferior *
find_inferior_pid (int pid)
{
- struct inferior *inf;
-
/* 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 (inf = inferior_list; inf; inf = inf->next)
+ for (inferior *inf : all_inferiors ())
if (inf->pid == pid)
return inf;
struct inferior *
find_inferior_for_program_space (struct program_space *pspace)
{
- struct inferior *inf = current_inferior ();
+ struct inferior *cur_inf = current_inferior ();
- if (inf->pspace == pspace)
- return inf;
+ if (cur_inf->pspace == pspace)
+ return cur_inf;
- for (inf = inferior_list; inf != NULL; inf = inf->next)
- {
- if (inf->pspace == pspace)
- return inf;
- }
+ for (inferior *inf : all_inferiors ())
+ if (inf->pspace == pspace)
+ return inf;
return NULL;
}
iterate_over_inferiors (int (*callback) (struct inferior *, void *),
void *data)
{
- struct inferior *inf, *infnext;
-
- for (inf = inferior_list; inf; inf = infnext)
- {
- infnext = inf->next;
- if ((*callback) (inf, data))
- return inf;
- }
+ for (inferior *inf : all_inferiors_safe ())
+ if ((*callback) (inf, data))
+ return inf;
return NULL;
}
int
have_inferiors (void)
{
- struct inferior *inf;
-
- for (inf = inferior_list; inf; inf = inf->next)
- if (inf->pid != 0)
- return 1;
+ for (inferior *inf ATTRIBUTE_UNUSED : all_non_exited_inferiors ())
+ return 1;
return 0;
}
int
number_of_live_inferiors (void)
{
- struct inferior *inf;
int num_inf = 0;
- for (inf = inferior_list; inf; inf = inf->next)
- if (inf->pid != 0)
- {
- struct thread_info *tp;
-
- ALL_NON_EXITED_THREADS (tp)
- if (tp && tp->ptid.pid () == inf->pid)
- if (target_has_execution_1 (tp->ptid))
- {
- /* Found a live thread in this inferior, go to the next
- inferior. */
- ++num_inf;
- break;
- }
- }
+ for (inferior *inf : all_non_exited_inferiors ())
+ if (target_has_execution_1 (ptid_t (inf->pid)))
+ for (thread_info *tp ATTRIBUTE_UNUSED : inf->non_exited_threads ())
+ {
+ /* Found a live thread in this inferior, go to the next
+ inferior. */
+ ++num_inf;
+ break;
+ }
return num_inf;
}
int
number_of_inferiors (void)
{
- struct inferior *inf;
- int count = 0;
-
- for (inf = inferior_list; inf != NULL; inf = inf->next)
- count++;
-
- return count;
+ auto rng = all_inferiors ();
+ return std::distance (rng.begin (), rng.end ());
}
/* Converts an inferior process id to a string. Like
target_pid_to_str, but special cases the null process. */
-static const char *
+static std::string
inferior_pid_to_str (int pid)
{
if (pid != 0)
filename = _("<noexec>");
uiout->message (_("[Switching to inferior %d [%s] (%s)]\n"),
- inf->num, inferior_pid_to_str (inf->pid), filename);
+ inf->num, inferior_pid_to_str (inf->pid).c_str (), filename);
}
/* Prints the list of inferiors and their details on UIOUT. This is a
static void
print_inferior (struct ui_out *uiout, const char *requested_inferiors)
{
- struct inferior *inf;
int inf_count = 0;
/* Compute number of inferiors we will print. */
- for (inf = inferior_list; inf; inf = inf->next)
+ for (inferior *inf : all_inferiors ())
{
if (!number_is_in_list (requested_inferiors, inf->num))
continue;
uiout->table_header (17, ui_left, "exec", "Executable");
uiout->table_body ();
- for (inf = inferior_list; inf; inf = inf->next)
+ for (inferior *inf : all_inferiors ())
{
if (!number_is_in_list (requested_inferiors, inf->num))
continue;
else
uiout->field_skip ("current");
- uiout->field_int ("number", inf->num);
+ uiout->field_signed ("number", inf->num);
uiout->field_string ("target-id", inferior_pid_to_str (inf->pid));
if (inf->vfork_parent)
{
uiout->text (_("\n\tis vfork child of inferior "));
- uiout->field_int ("vfork-parent", inf->vfork_parent->num);
+ uiout->field_signed ("vfork-parent", inf->vfork_parent->num);
}
if (inf->vfork_child)
{
uiout->text (_("\n\tis vfork parent of inferior "));
- uiout->field_int ("vfork-child", inf->vfork_child->num);
+ uiout->field_signed ("vfork-child", inf->vfork_child->num);
}
uiout->text ("\n");
add_setshow_boolean_cmd ("inferior-events", no_class,
&print_inferior_events, _("\
-Set printing of inferior events (e.g., inferior start and exit)."), _("\
-Show printing of inferior events (e.g., inferior start and exit)."), NULL,
+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);