#include "symtab.h"
#include "frame.h"
#include "inferior.h"
-#include "common/environ.h"
+#include "gdbsupport/environ.h"
#include "value.h"
#include "target.h"
#include "gdbthread.h"
#include "thread-fsm.h"
#include "tid-parse.h"
#include <algorithm>
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
#include "inline-frame.h"
#include "stack.h"
else
set_thread_exited (tp, 1);
- inf->thread_list = NULL;
+ inf->thread_map.clear();
}
}
{
thread_info *tp = new thread_info (inf, ptid);
- if (inf->thread_list == NULL)
- inf->thread_list = tp;
- else
- {
- struct thread_info *last;
+ /* A thread with this ptid should not exist yet. */
+ gdb_assert (inf->thread_map.find (ptid) == inf->thread_map.end ());
- for (last = inf->thread_list; last->next != NULL; last = last->next)
- ;
- last->next = tp;
- }
+ inf->thread_map[ptid] = tp;
return tp;
}
step_over_chain_remove (&step_over_queue_head, tp);
}
-/* Delete the thread referenced by THR. If SILENT, don't notifyi
+/* Delete the thread referenced by THR. If SILENT, don't notify
the observer of this exit.
THR must not be NULL or a failed assertion will be raised. */
static void
-delete_thread_1 (thread_info *thr, bool silent)
+delete_thread_1 (thread_info *thr, bool silent, bool remove)
{
gdb_assert (thr != nullptr);
- struct thread_info *tp, *tpprev = NULL;
-
- for (tp = thr->inf->thread_list; tp; tpprev = tp, tp = tp->next)
- if (tp == thr)
- break;
-
- if (!tp)
- return;
-
- set_thread_exited (tp, silent);
+ set_thread_exited (thr, silent);
- if (!tp->deletable ())
+ if (!thr->deletable ())
{
/* Will be really deleted some other time. */
return;
}
- if (tpprev)
- tpprev->next = tp->next;
- else
- tp->inf->thread_list = tp->next;
+ if (remove)
+ {
+ size_t nr_deleted = thr->inf->thread_map.erase(thr->ptid);
+ gdb_assert (nr_deleted == 1);
+ }
- delete tp;
+ delete thr;
}
/* Delete thread THREAD and notify of thread exit. If this is the
void
delete_thread (thread_info *thread)
{
- delete_thread_1 (thread, false /* not silent */);
+ delete_thread_1 (thread, false /* not silent */, true /* remove */);
+}
+
+void
+delete_thread_noremove (thread_info *thread)
+{
+ delete_thread_1 (thread, false /* silent */, false /* don't remove */);
}
void
delete_thread_silent (thread_info *thread)
{
- delete_thread_1 (thread, true /* silent */);
+ delete_thread_1 (thread, true /* silent */, true /* remove */);
+}
+
+void
+delete_thread_silent_noremove (thread_info *thread)
+{
+ delete_thread_1 (thread, true /* silent */, false /* don't remove */);
}
struct thread_info *
struct thread_info *
find_thread_ptid (inferior *inf, ptid_t ptid)
{
- for (thread_info *tp : inf->threads ())
- if (tp->ptid == ptid)
- return tp;
-
- return NULL;
+ auto it = inf->thread_map.find (ptid);
+ if (it != inf->thread_map.end ())
+ return it->second;
+ else
+ return nullptr;
}
/* See gdbthread.h. */
thread_info *
first_thread_of_inferior (inferior *inf)
{
- return inf->thread_list;
+ gdb_assert (!inf->thread_map.empty ());
+
+ auto compare_by_per_inf_num = [] (const ptid_thread_map::value_type &a,
+ const ptid_thread_map::value_type &b)
+ {
+ return a.second->per_inf_num < b.second->per_inf_num;
+ };
+ auto it = std::min_element (inf->thread_map.begin (), inf->thread_map.end (),
+ compare_by_per_inf_num);
+
+ return it->second;
}
thread_info *
delete_thread (tp);
}
-/* Return true value if stack temporaies are enabled for the thread
+/* Return true value if stack temporaries are enabled for the thread
TP. */
bool
inf->pid = new_ptid.pid ();
tp = find_thread_ptid (inf, old_ptid);
+ gdb_assert (tp != nullptr);
+
+ int num_erased = inf->thread_map.erase (old_ptid);
+ gdb_assert (num_erased == 1);
+
tp->ptid = new_ptid;
+ inf->thread_map[new_ptid] = tp;
gdb::observers::thread_ptid_changed.notify (old_ptid, new_ptid);
}
scoped_restore_current_thread restore_thread;
for (inferior *inf : all_inferiors ())
- for (thread_info *tp : inf->threads ())
{
- int core;
-
- any_thread = true;
- if (tp == current_thread && tp->state == THREAD_EXITED)
- current_exited = true;
+ /* Print the threads in per-inferior number order. */
+ std::vector<thread_info *> threads_to_print;
- if (!should_print_thread (requested_threads, default_inf_num,
- global_ids, pid, tp))
- continue;
+ for (thread_info *tp : inf->threads ())
+ threads_to_print.push_back (tp);
- ui_out_emit_tuple tuple_emitter (uiout, NULL);
+ std::sort (threads_to_print.begin (), threads_to_print.end (),
+ [] (thread_info *a, thread_info *b)
+ {
+ return a->per_inf_num < b->per_inf_num;
+ });
- if (!uiout->is_mi_like_p ())
+ for (thread_info *tp : threads_to_print)
{
- if (tp == current_thread)
- uiout->field_string ("current", "*");
- else
- uiout->field_skip ("current");
+ int core;
- uiout->field_string ("id-in-tg", print_thread_id (tp));
- }
+ any_thread = true;
+ if (tp == current_thread && tp->state == THREAD_EXITED)
+ current_exited = true;
- if (show_global_ids || uiout->is_mi_like_p ())
- uiout->field_int ("id", tp->global_num);
+ if (!should_print_thread (requested_threads, default_inf_num,
+ global_ids, pid, tp))
+ continue;
- /* For the CLI, we stuff everything into the target-id field.
- This is a gross hack to make the output come out looking
- correct. The underlying problem here is that ui-out has no
- way to specify that a field's space allocation should be
- shared by several fields. For MI, we do the right thing
- instead. */
+ ui_out_emit_tuple tuple_emitter (uiout, NULL);
- if (uiout->is_mi_like_p ())
- {
- uiout->field_string ("target-id", target_pid_to_str (tp->ptid));
+ if (!uiout->is_mi_like_p ())
+ {
+ if (tp == current_thread)
+ uiout->field_string ("current", "*");
+ else
+ uiout->field_skip ("current");
- const char *extra_info = target_extra_thread_info (tp);
- if (extra_info != nullptr)
- uiout->field_string ("details", extra_info);
+ uiout->field_string ("id-in-tg", print_thread_id (tp));
+ }
- const char *name = (tp->name != nullptr
- ? tp->name
- : target_thread_name (tp));
- if (name != NULL)
- uiout->field_string ("name", name);
- }
- else
- {
- uiout->field_string ("target-id",
- thread_target_id_str (tp).c_str ());
- }
+ if (show_global_ids || uiout->is_mi_like_p ())
+ uiout->field_signed ("id", tp->global_num);
- if (tp->state == THREAD_RUNNING)
- uiout->text ("(running)\n");
- else
- {
- /* The switch below puts us at the top of the stack (leaf
- frame). */
- switch_to_thread (tp);
- print_stack_frame (get_selected_frame (NULL),
- /* For MI output, print frame level. */
- uiout->is_mi_like_p (),
- LOCATION, 0);
- }
+ /* For the CLI, we stuff everything into the target-id field.
+ This is a gross hack to make the output come out looking
+ correct. The underlying problem here is that ui-out has no
+ way to specify that a field's space allocation should be
+ shared by several fields. For MI, we do the right thing
+ instead. */
- if (uiout->is_mi_like_p ())
- {
- const char *state = "stopped";
+ if (uiout->is_mi_like_p ())
+ {
+ uiout->field_string ("target-id", target_pid_to_str (tp->ptid));
+
+ const char *extra_info = target_extra_thread_info (tp);
+ if (extra_info != nullptr)
+ uiout->field_string ("details", extra_info);
+
+ const char *name = (tp->name != nullptr
+ ? tp->name
+ : target_thread_name (tp));
+ if (name != NULL)
+ uiout->field_string ("name", name);
+ }
+ else
+ {
+ uiout->field_string ("target-id",
+ thread_target_id_str (tp).c_str ());
+ }
if (tp->state == THREAD_RUNNING)
- state = "running";
- uiout->field_string ("state", state);
- }
+ uiout->text ("(running)\n");
+ else
+ {
+ /* The switch below puts us at the top of the stack (leaf
+ frame). */
+ switch_to_thread (tp);
+ print_stack_frame (get_selected_frame (NULL),
+ /* For MI output, print frame level. */
+ uiout->is_mi_like_p (),
+ LOCATION, 0);
+ }
+
+ if (uiout->is_mi_like_p ())
+ {
+ const char *state = "stopped";
- core = target_core_of_thread (tp->ptid);
- if (uiout->is_mi_like_p () && core != -1)
- uiout->field_int ("core", core);
+ if (tp->state == THREAD_RUNNING)
+ state = "running";
+ uiout->field_string ("state", state);
+ }
+
+ core = target_core_of_thread (tp->ptid);
+ if (uiout->is_mi_like_p () && core != -1)
+ uiout->field_signed ("core", core);
+ }
}
/* This end scope restores the current thread and the frame
if (pid == -1 && requested_threads == NULL)
{
if (uiout->is_mi_like_p () && inferior_ptid != null_ptid)
- uiout->field_int ("current-thread-id", current_thread->global_num);
+ uiout->field_signed ("current-thread-id", current_thread->global_num);
if (inferior_ptid != null_ptid && current_exited)
uiout->message ("\n\
print_thread_info_1 (uiout, requested_threads, 1, pid, 0);
}
+/* The options for the "info threads" command. */
+
+struct info_threads_opts
+{
+ /* For "-gid". */
+ bool show_global_ids = false;
+};
+
+static const gdb::option::option_def info_threads_option_defs[] = {
+
+ gdb::option::flag_option_def<info_threads_opts> {
+ "gid",
+ [] (info_threads_opts *opts) { return &opts->show_global_ids; },
+ N_("Show global thread IDs."),
+ },
+
+};
+
+/* Create an option_def_group for the "info threads" options, with
+ IT_OPTS as context. */
+
+static inline gdb::option::option_def_group
+make_info_threads_options_def_group (info_threads_opts *it_opts)
+{
+ return {{info_threads_option_defs}, it_opts};
+}
+
/* Implementation of the "info threads" command.
Note: this has the drawback that it _really_ switches
static void
info_threads_command (const char *arg, int from_tty)
{
- int show_global_ids = 0;
+ info_threads_opts it_opts;
- if (arg != NULL
- && check_for_argument (&arg, "-gid", sizeof ("-gid") - 1))
+ auto grp = make_info_threads_options_def_group (&it_opts);
+ gdb::option::process_options
+ (&arg, gdb::option::PROCESS_OPTIONS_UNKNOWN_IS_ERROR, grp);
+
+ print_thread_info_1 (current_uiout, arg, 0, -1, it_opts.show_global_ids);
+}
+
+/* Completer for the "info threads" command. */
+
+static void
+info_threads_command_completer (struct cmd_list_element *ignore,
+ completion_tracker &tracker,
+ const char *text, const char *word_ignored)
+{
+ const auto grp = make_info_threads_options_def_group (nullptr);
+
+ if (gdb::option::complete_options
+ (tracker, &text, gdb::option::PROCESS_OPTIONS_UNKNOWN_IS_ERROR, grp))
+ return;
+
+ /* Convenience to let the user know what the option can accept. */
+ if (*text == '\0')
{
- arg = skip_spaces (arg);
- show_global_ids = 1;
+ gdb::option::complete_on_all_options (tracker, grp);
+ /* Keep this "ID" in sync with what "help info threads"
+ says. */
+ tracker.add_completion (make_unique_xstrdup ("ID"));
}
-
- print_thread_info_1 (current_uiout, arg, 0, -1, show_global_ids);
}
/* See gdbthread.h. */
reinit_frame_cache ();
}
-/* See common/common-gdbthread.h. */
+/* See gdbsupport/common-gdbthread.h. */
void
switch_to_thread (ptid_t ptid)
ASCENDING and FLAGS as context. */
static inline std::array<gdb::option::option_def_group, 2>
-make_thread_apply_all_options_def_group (int *ascending,
+make_thread_apply_all_options_def_group (bool *ascending,
qcs_flags *flags)
{
return {{
- { ascending_option_def.def (), ascending},
- { thr_qcs_flags_option_defs, flags },
+ { {ascending_option_def.def ()}, ascending},
+ { {thr_qcs_flags_option_defs}, flags },
}};
}
static inline gdb::option::option_def_group
make_thread_apply_options_def_group (qcs_flags *flags)
{
- return {thr_qcs_flags_option_defs, flags};
+ return {{thr_qcs_flags_option_defs}, flags};
}
/* Apply a GDB command to a list of threads. List syntax is a whitespace
static void
thread_apply_all_command (const char *cmd, int from_tty)
{
- int ascending = false;
+ bool ascending = false;
qcs_flags flags;
auto group = make_thread_apply_all_options_def_group (&ascending,
static void
taas_command (const char *cmd, int from_tty)
{
+ if (cmd == NULL || *cmd == '\0')
+ error (_("Please specify a command to apply on all threads"));
std::string expanded = std::string ("thread apply all -s ") + cmd;
execute_command (expanded.c_str (), from_tty);
}
static void
tfaas_command (const char *cmd, int from_tty)
{
+ if (cmd == NULL || *cmd == '\0')
+ error (_("Please specify a command to apply on all frames of all threads"));
std::string expanded
= std::string ("thread apply all -s -- frame apply all -s ") + cmd;
execute_command (expanded.c_str (), from_tty);
}
/* Print notices when new threads are attached and detached. */
-int print_thread_events = 1;
+bool print_thread_events = true;
static void
show_print_thread_events (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
if (uiout->is_mi_like_p ())
{
- uiout->field_int ("new-thread-id",
- inferior_thread ()->global_num);
+ uiout->field_signed ("new-thread-id",
+ inferior_thread ()->global_num);
}
else
{
static struct cmd_list_element *thread_apply_list = NULL;
cmd_list_element *c;
- add_info ("threads", info_threads_command,
- _("Display currently known threads.\n\
-Usage: info threads [-gid] [ID]...\n\
--gid: Show global thread IDs.\n\
+ const auto info_threads_opts = make_info_threads_options_def_group (nullptr);
+
+ /* Note: keep this "ID" in sync with what "info threads [TAB]"
+ suggests. */
+ static std::string info_threads_help
+ = gdb::option::build_help (_("\
+Display currently known threads.\n\
+Usage: info threads [OPTION]... [ID]...\n\
+\n\
+Options:\n\
+%OPTIONS%\
If ID is given, it is a space-separated list of IDs of threads to display.\n\
-Otherwise, all threads are displayed."));
+Otherwise, all threads are displayed."),
+ info_threads_opts);
+
+ c = add_info ("threads", info_threads_command, info_threads_help.c_str ());
+ set_cmd_completer_handle_brkchars (c, info_threads_command_completer);
add_prefix_cmd ("thread", class_run, thread_command, _("\
Use this command to switch between threads.\n\
const auto thread_apply_opts = make_thread_apply_options_def_group (nullptr);
- static std::string thread_apply_help = gdb::option::build_help (N_("\
+ static std::string thread_apply_help = gdb::option::build_help (_("\
Apply a command to a list of threads.\n\
Usage: thread apply ID... [OPTION]... COMMAND\n\
ID is a space-separated list of IDs of threads to apply COMMAND on.\n"
const auto thread_apply_all_opts
= make_thread_apply_all_options_def_group (nullptr, nullptr);
- static std::string thread_apply_all_help = gdb::option::build_help (N_("\
+ static std::string thread_apply_all_help = gdb::option::build_help (_("\
Apply a command to all threads.\n\
\n\
Usage: thread apply all [OPTION]... COMMAND\n"
projects / deliverable / binutils-gdb.git / blobdiff