X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fthread.c;h=28e5ef8b5e5ffc6ab7a6309be941a52079fee79a;hb=5b6d1e4fa4fc6827c7b3f0e99ff120dfa14d65d2;hp=3090b692556ffaa0c9ff9096be5bc59855274daf;hpb=be34f8494e0befe68d8071f46edc16d9aa3c9238;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/thread.c b/gdb/thread.c index 3090b69255..03fdc05140 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -1,8 +1,6 @@ /* Multi-process/thread control for GDB, the GNU debugger. - Copyright (C) 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. Contributed by Lynx Real-Time Systems, Inc. Los Gatos, CA. @@ -25,81 +23,149 @@ #include "symtab.h" #include "frame.h" #include "inferior.h" -#include "environ.h" +#include "gdbsupport/environ.h" #include "value.h" #include "target.h" #include "gdbthread.h" -#include "exceptions.h" #include "command.h" #include "gdbcmd.h" #include "regcache.h" -#include "gdb.h" -#include "gdb_string.h" +#include "btrace.h" #include #include #include #include "ui-out.h" -#include "observer.h" +#include "observable.h" #include "annotate.h" #include "cli/cli-decode.h" +#include "cli/cli-option.h" #include "gdb_regex.h" #include "cli/cli-utils.h" -#include "continuations.h" +#include "thread-fsm.h" +#include "tid-parse.h" +#include +#include "gdbsupport/gdb_optional.h" +#include "inline-frame.h" +#include "stack.h" /* Definition of struct thread_info exported to gdbthread.h. */ -/* Prototypes for exported functions. */ - -void _initialize_thread (void); - /* Prototypes for local functions. */ -static struct thread_info *thread_list = NULL; static int highest_thread_num; -static void thread_command (char *tidstr, int from_tty); -static void thread_apply_all_command (char *, int); -static int thread_alive (struct thread_info *); -static void info_threads_command (char *, int); -static void thread_apply_command (char *, int); -static void restore_current_thread (ptid_t); -static void prune_threads (void); - -/* Frontend view of the thread state. Possible extensions: stepping, - finishing, until(ling),... */ -enum thread_state -{ - THREAD_STOPPED, - THREAD_RUNNING, - THREAD_EXITED, +/* RAII type used to increase / decrease the refcount of each thread + in a given list of threads. */ + +class scoped_inc_dec_ref +{ +public: + explicit scoped_inc_dec_ref (const std::vector &thrds) + : m_thrds (thrds) + { + for (thread_info *thr : m_thrds) + thr->incref (); + } + + ~scoped_inc_dec_ref () + { + for (thread_info *thr : m_thrds) + thr->decref (); + } + +private: + const std::vector &m_thrds; }; + struct thread_info* inferior_thread (void) { - struct thread_info *tp = find_thread_ptid (inferior_ptid); + struct thread_info *tp = find_thread_ptid (current_inferior (), inferior_ptid); gdb_assert (tp); return tp; } +/* Delete the breakpoint pointed at by BP_P, if there's one. */ + +static void +delete_thread_breakpoint (struct breakpoint **bp_p) +{ + if (*bp_p != NULL) + { + delete_breakpoint (*bp_p); + *bp_p = NULL; + } +} + void delete_step_resume_breakpoint (struct thread_info *tp) { - if (tp && tp->control.step_resume_breakpoint) + if (tp != NULL) + delete_thread_breakpoint (&tp->control.step_resume_breakpoint); +} + +void +delete_exception_resume_breakpoint (struct thread_info *tp) +{ + if (tp != NULL) + delete_thread_breakpoint (&tp->control.exception_resume_breakpoint); +} + +/* See gdbthread.h. */ + +void +delete_single_step_breakpoints (struct thread_info *tp) +{ + if (tp != NULL) + delete_thread_breakpoint (&tp->control.single_step_breakpoints); +} + +/* Delete the breakpoint pointed at by BP_P at the next stop, if + there's one. */ + +static void +delete_at_next_stop (struct breakpoint **bp) +{ + if (*bp != NULL) { - delete_breakpoint (tp->control.step_resume_breakpoint); - tp->control.step_resume_breakpoint = NULL; + (*bp)->disposition = disp_del_at_next_stop; + *bp = NULL; } } +/* See gdbthread.h. */ + +int +thread_has_single_step_breakpoints_set (struct thread_info *tp) +{ + return tp->control.single_step_breakpoints != NULL; +} + +/* See gdbthread.h. */ + +int +thread_has_single_step_breakpoint_here (struct thread_info *tp, + const address_space *aspace, + CORE_ADDR addr) +{ + struct breakpoint *ss_bps = tp->control.single_step_breakpoints; + + return (ss_bps != NULL + && breakpoint_has_location_inserted_here (ss_bps, aspace, addr)); +} + +/* See gdbthread.h. */ + void -delete_exception_resume_breakpoint (struct thread_info *tp) +thread_cancel_execution_command (struct thread_info *thr) { - if (tp && tp->control.exception_resume_breakpoint) + if (thr->thread_fsm != NULL) { - delete_breakpoint (tp->control.exception_resume_breakpoint); - tp->control.exception_resume_breakpoint = NULL; + thr->thread_fsm->clean_up (thr); + delete thr->thread_fsm; + thr->thread_fsm = NULL; } } @@ -110,91 +176,88 @@ clear_thread_inferior_resources (struct thread_info *tp) but not any user-specified thread-specific breakpoints. We can not delete the breakpoint straight-off, because the inferior might not be stopped at the moment. */ - if (tp->control.step_resume_breakpoint) - { - tp->control.step_resume_breakpoint->disposition = disp_del_at_next_stop; - tp->control.step_resume_breakpoint = NULL; - } + delete_at_next_stop (&tp->control.step_resume_breakpoint); + delete_at_next_stop (&tp->control.exception_resume_breakpoint); + delete_at_next_stop (&tp->control.single_step_breakpoints); - if (tp->control.exception_resume_breakpoint) - { - tp->control.exception_resume_breakpoint->disposition - = disp_del_at_next_stop; - tp->control.exception_resume_breakpoint = NULL; - } + delete_longjmp_breakpoint_at_next_stop (tp->global_num); bpstat_clear (&tp->control.stop_bpstat); - discard_all_intermediate_continuations_thread (tp); - discard_all_continuations_thread (tp); + btrace_teardown (tp); - delete_longjmp_breakpoint (tp->num); + thread_cancel_execution_command (tp); + + clear_inline_frame_state (tp); } +/* Set the TP's state as exited. */ + static void -free_thread (struct thread_info *tp) +set_thread_exited (thread_info *tp, int silent) { - clear_thread_inferior_resources (tp); + /* Dead threads don't need to step-over. Remove from queue. */ + if (tp->step_over_next != NULL) + thread_step_over_chain_remove (tp); - if (tp->private) + if (tp->state != THREAD_EXITED) { - if (tp->private_dtor) - tp->private_dtor (tp->private); - else - xfree (tp->private); - } + gdb::observers::thread_exit.notify (tp, silent); + + /* Tag it as exited. */ + tp->state = THREAD_EXITED; - xfree (tp->name); - xfree (tp); + /* Clear breakpoints, etc. associated with this thread. */ + clear_thread_inferior_resources (tp); + } } void init_thread_list (void) { - struct thread_info *tp, *tpnext; - highest_thread_num = 0; - if (!thread_list) - return; - - for (tp = thread_list; tp; tp = tpnext) + for (thread_info *tp : all_threads_safe ()) { - tpnext = tp->next; - free_thread (tp); - } + inferior *inf = tp->inf; - thread_list = NULL; + if (tp->deletable ()) + delete tp; + else + set_thread_exited (tp, 1); + + inf->thread_list = NULL; + } } -/* Allocate a new thread with target id PTID and add it to the thread - list. */ +/* Allocate a new thread of inferior INF with target id PTID and add + it to the thread list. */ static struct thread_info * -new_thread (ptid_t ptid) +new_thread (struct inferior *inf, ptid_t ptid) { - struct thread_info *tp; - - tp = xcalloc (1, sizeof (*tp)); + thread_info *tp = new thread_info (inf, ptid); - tp->ptid = ptid; - tp->num = ++highest_thread_num; - tp->next = thread_list; - thread_list = tp; + if (inf->thread_list == NULL) + inf->thread_list = tp; + else + { + struct thread_info *last; - /* Nothing to follow yet. */ - tp->pending_follow.kind = TARGET_WAITKIND_SPURIOUS; - tp->state_ = THREAD_STOPPED; + for (last = inf->thread_list; last->next != NULL; last = last->next) + ; + last->next = tp; + } return tp; } struct thread_info * -add_thread_silent (ptid_t ptid) +add_thread_silent (process_stratum_target *targ, ptid_t ptid) { - struct thread_info *tp; + inferior *inf; - tp = find_thread_ptid (ptid); + thread_info *tp = find_thread_ptid (targ, ptid); if (tp) /* Found an old thread with the same id. It has to be dead, otherwise we wouldn't be adding a new thread with the same id. @@ -208,91 +271,205 @@ add_thread_silent (ptid_t ptid) to it, delete the original thread, reset the new thread's ptid, and switch to it. */ - if (ptid_equal (inferior_ptid, ptid)) + if (inferior_ptid == ptid) { - tp = new_thread (null_ptid); + thread_info *new_thr = new_thread (tp->inf, null_ptid); /* Make switch_to_thread not read from the thread. */ - tp->state_ = THREAD_EXITED; - switch_to_thread (null_ptid); + new_thr->state = THREAD_EXITED; + switch_to_no_thread (); /* Now we can delete it. */ - delete_thread (ptid); + delete_thread (tp); /* Now reset its ptid, and reswitch inferior_ptid to it. */ - tp->ptid = ptid; - tp->state_ = THREAD_STOPPED; - switch_to_thread (ptid); + new_thr->ptid = ptid; + new_thr->state = THREAD_STOPPED; + switch_to_thread (new_thr); - observer_notify_new_thread (tp); + gdb::observers::new_thread.notify (new_thr); /* All done. */ - return tp; + return new_thr; } - else - /* Just go ahead and delete it. */ - delete_thread (ptid); + + inf = tp->inf; + + /* Just go ahead and delete it. */ + delete_thread (tp); } + else + inf = find_inferior_ptid (targ, ptid); - tp = new_thread (ptid); - observer_notify_new_thread (tp); + tp = new_thread (inf, ptid); + gdb::observers::new_thread.notify (tp); return tp; } struct thread_info * -add_thread_with_info (ptid_t ptid, struct private_thread_info *private) +add_thread_with_info (process_stratum_target *targ, ptid_t ptid, + private_thread_info *priv) { - struct thread_info *result = add_thread_silent (ptid); + thread_info *result = add_thread_silent (targ, ptid); - result->private = private; + result->priv.reset (priv); if (print_thread_events) - printf_unfiltered (_("[New %s]\n"), target_pid_to_str (ptid)); + printf_unfiltered (_("[New %s]\n"), target_pid_to_str (ptid).c_str ()); annotate_new_thread (); return result; } struct thread_info * -add_thread (ptid_t ptid) +add_thread (process_stratum_target *targ, ptid_t ptid) { - return add_thread_with_info (ptid, NULL); + return add_thread_with_info (targ, ptid, NULL); } -/* Delete thread PTID. If SILENT, don't notify the observer of this - exit. */ -static void -delete_thread_1 (ptid_t ptid, int silent) +private_thread_info::~private_thread_info () = default; + +thread_info::thread_info (struct inferior *inf_, ptid_t ptid_) + : ptid (ptid_), inf (inf_) { - struct thread_info *tp, *tpprev; + gdb_assert (inf_ != NULL); - tpprev = NULL; + this->global_num = ++highest_thread_num; + this->per_inf_num = ++inf_->highest_thread_num; - for (tp = thread_list; tp; tpprev = tp, tp = tp->next) - if (ptid_equal (tp->ptid, ptid)) - break; + /* Nothing to follow yet. */ + memset (&this->pending_follow, 0, sizeof (this->pending_follow)); + this->pending_follow.kind = TARGET_WAITKIND_SPURIOUS; + this->suspend.waitstatus.kind = TARGET_WAITKIND_IGNORE; +} - if (!tp) - return; +thread_info::~thread_info () +{ + xfree (this->name); +} + +/* Returns true if THR is the current thread. */ + +static bool +is_current_thread (const thread_info *thr) +{ + return thr->inf == current_inferior () && thr->ptid == inferior_ptid; +} + +/* See gdbthread.h. */ +bool +thread_info::deletable () const +{ /* If this is the current thread, or there's code out there that - relies on it existing (refcount > 0) we can't delete yet. Mark - it as exited, and notify it. */ - if (tp->refcount > 0 - || ptid_equal (tp->ptid, inferior_ptid)) + relies on it existing (refcount > 0) we can't delete yet. */ + return refcount () == 0 && !is_current_thread (this); +} + +/* Add TP to the end of the step-over chain LIST_P. */ + +static void +step_over_chain_enqueue (struct thread_info **list_p, struct thread_info *tp) +{ + gdb_assert (tp->step_over_next == NULL); + gdb_assert (tp->step_over_prev == NULL); + + if (*list_p == NULL) { - if (tp->state_ != THREAD_EXITED) - { - observer_notify_thread_exit (tp, silent); + *list_p = tp; + tp->step_over_prev = tp->step_over_next = tp; + } + else + { + struct thread_info *head = *list_p; + struct thread_info *tail = head->step_over_prev; - /* Tag it as exited. */ - tp->state_ = THREAD_EXITED; + tp->step_over_prev = tail; + tp->step_over_next = head; + head->step_over_prev = tp; + tail->step_over_next = tp; + } +} - /* Clear breakpoints, etc. associated with this thread. */ - clear_thread_inferior_resources (tp); - } +/* Remove TP from step-over chain LIST_P. */ + +static void +step_over_chain_remove (struct thread_info **list_p, struct thread_info *tp) +{ + gdb_assert (tp->step_over_next != NULL); + gdb_assert (tp->step_over_prev != NULL); + + if (*list_p == tp) + { + if (tp == tp->step_over_next) + *list_p = NULL; + else + *list_p = tp->step_over_next; + } + + tp->step_over_prev->step_over_next = tp->step_over_next; + tp->step_over_next->step_over_prev = tp->step_over_prev; + tp->step_over_prev = tp->step_over_next = NULL; +} + +/* See gdbthread.h. */ + +struct thread_info * +thread_step_over_chain_next (struct thread_info *tp) +{ + struct thread_info *next = tp->step_over_next; + return (next == step_over_queue_head ? NULL : next); +} + +/* See gdbthread.h. */ + +int +thread_is_in_step_over_chain (struct thread_info *tp) +{ + return (tp->step_over_next != NULL); +} + +/* See gdbthread.h. */ + +void +thread_step_over_chain_enqueue (struct thread_info *tp) +{ + step_over_chain_enqueue (&step_over_queue_head, tp); +} + +/* See gdbthread.h. */ + +void +thread_step_over_chain_remove (struct thread_info *tp) +{ + step_over_chain_remove (&step_over_queue_head, tp); +} + +/* 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) +{ + 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); + + if (!tp->deletable ()) + { /* Will be really deleted some other time. */ return; } @@ -300,67 +477,93 @@ delete_thread_1 (ptid_t ptid, int silent) if (tpprev) tpprev->next = tp->next; else - thread_list = tp->next; + tp->inf->thread_list = tp->next; - /* Notify thread exit, but only if we haven't already. */ - if (tp->state_ != THREAD_EXITED) - observer_notify_thread_exit (tp, silent); - - free_thread (tp); + delete tp; } -/* Delete thread PTID and notify of thread exit. If this is - inferior_ptid, don't actually delete it, but tag it as exited and - do the notification. If PTID is the user selected thread, clear +/* Delete thread THREAD and notify of thread exit. If this is the + current thread, don't actually delete it, but tag it as exited and + do the notification. If this is the user selected thread, clear it. */ + void -delete_thread (ptid_t ptid) +delete_thread (thread_info *thread) { - delete_thread_1 (ptid, 0 /* not silent */); + delete_thread_1 (thread, false /* not silent */); } void -delete_thread_silent (ptid_t ptid) +delete_thread_silent (thread_info *thread) { - delete_thread_1 (ptid, 1 /* silent */); + delete_thread_1 (thread, true /* silent */); } struct thread_info * -find_thread_id (int num) +find_thread_global_id (int global_id) { - struct thread_info *tp; + for (thread_info *tp : all_threads ()) + if (tp->global_num == global_id) + return tp; + + return NULL; +} - for (tp = thread_list; tp; tp = tp->next) - if (tp->num == num) +static struct thread_info * +find_thread_id (struct inferior *inf, int thr_num) +{ + for (thread_info *tp : inf->threads ()) + if (tp->per_inf_num == thr_num) return tp; return NULL; } -/* Find a thread_info by matching PTID. */ +/* See gdbthread.h. */ + struct thread_info * -find_thread_ptid (ptid_t ptid) +find_thread_ptid (process_stratum_target *targ, ptid_t ptid) { - struct thread_info *tp; + inferior *inf = find_inferior_ptid (targ, ptid); + if (inf == NULL) + return NULL; + return find_thread_ptid (inf, ptid); +} - for (tp = thread_list; tp; tp = tp->next) - if (ptid_equal (tp->ptid, ptid)) +/* See gdbthread.h. */ + +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; } +/* See gdbthread.h. */ + +struct thread_info * +find_thread_by_handle (gdb::array_view handle, + struct inferior *inf) +{ + return target_thread_handle_to_thread_info (handle.data (), + handle.size (), + inf); +} + /* * Thread iterator function. * * Calls a callback function once for each thread, so long as * the callback function returns false. If the callback function * returns true, the iteration will end and the current thread - * will be returned. This can be useful for implementing a + * will be returned. This can be useful for implementing a * search for a thread with arbitrary attributes, or for applying * some operation to every thread. * - * FIXME: some of the existing functionality, such as + * FIXME: some of the existing functionality, such as * "Thread apply all", might be rewritten using this functionality. */ @@ -368,194 +571,230 @@ struct thread_info * iterate_over_threads (int (*callback) (struct thread_info *, void *), void *data) { - struct thread_info *tp, *next; - - for (tp = thread_list; tp; tp = next) - { - next = tp->next; - if ((*callback) (tp, data)) - return tp; - } + for (thread_info *tp : all_threads_safe ()) + if ((*callback) (tp, data)) + return tp; return NULL; } +/* See gdbthread.h. */ + +bool +any_thread_p () +{ + for (thread_info *tp ATTRIBUTE_UNUSED : all_threads ()) + return true; + return false; +} + int -thread_count (void) +thread_count (process_stratum_target *proc_target) { - int result = 0; - struct thread_info *tp; + auto rng = all_threads (proc_target); + return std::distance (rng.begin (), rng.end ()); +} - for (tp = thread_list; tp; tp = tp->next) - ++result; +/* Return the number of non-exited threads in the thread list. */ - return result; +static int +live_threads_count (void) +{ + auto rng = all_non_exited_threads (); + return std::distance (rng.begin (), rng.end ()); } int -valid_thread_id (int num) +valid_global_thread_id (int global_id) { - struct thread_info *tp; - - for (tp = thread_list; tp; tp = tp->next) - if (tp->num == num) + for (thread_info *tp : all_threads ()) + if (tp->global_num == global_id) return 1; return 0; } -int -pid_to_thread_id (ptid_t ptid) +bool +in_thread_list (process_stratum_target *targ, ptid_t ptid) { - struct thread_info *tp; + return find_thread_ptid (targ, ptid) != nullptr; +} - for (tp = thread_list; tp; tp = tp->next) - if (ptid_equal (tp->ptid, ptid)) - return tp->num; +/* Finds the first thread of the inferior. */ - return 0; +thread_info * +first_thread_of_inferior (inferior *inf) +{ + return inf->thread_list; } -ptid_t -thread_id_to_pid (int num) +thread_info * +any_thread_of_inferior (inferior *inf) { - struct thread_info *thread = find_thread_id (num); + gdb_assert (inf->pid != 0); - if (thread) - return thread->ptid; - else - return pid_to_ptid (-1); + /* Prefer the current thread. */ + if (inf == current_inferior ()) + return inferior_thread (); + + for (thread_info *tp : inf->non_exited_threads ()) + return tp; + + return NULL; } -int -in_thread_list (ptid_t ptid) +thread_info * +any_live_thread_of_inferior (inferior *inf) { - struct thread_info *tp; + struct thread_info *curr_tp = NULL; + struct thread_info *tp_executing = NULL; - for (tp = thread_list; tp; tp = tp->next) - if (ptid_equal (tp->ptid, ptid)) - return 1; + gdb_assert (inf != NULL && inf->pid != 0); - return 0; /* Never heard of 'im. */ -} + /* Prefer the current thread if it's not executing. */ + if (inferior_ptid != null_ptid && current_inferior () == inf) + { + /* If the current thread is dead, forget it. If it's not + executing, use it. Otherwise, still choose it (below), but + only if no other non-executing thread is found. */ + curr_tp = inferior_thread (); + if (curr_tp->state == THREAD_EXITED) + curr_tp = NULL; + else if (!curr_tp->executing) + return curr_tp; + } -/* Finds the first thread of the inferior given by PID. If PID is -1, - return the first thread in the list. */ + for (thread_info *tp : inf->non_exited_threads ()) + { + if (!tp->executing) + return tp; -struct thread_info * -first_thread_of_process (int pid) -{ - struct thread_info *tp, *ret = NULL; + tp_executing = tp; + } - for (tp = thread_list; tp; tp = tp->next) - if (pid == -1 || ptid_get_pid (tp->ptid) == pid) - if (ret == NULL || tp->num < ret->num) - ret = tp; + /* If both the current thread and all live threads are executing, + prefer the current thread. */ + if (curr_tp != NULL) + return curr_tp; - return ret; + /* Otherwise, just return an executing thread, if any. */ + return tp_executing; } -struct thread_info * -any_thread_of_process (int pid) +/* Return true if TP is an active thread. */ +static bool +thread_alive (thread_info *tp) { - struct thread_info *tp; + if (tp->state == THREAD_EXITED) + return false; - for (tp = thread_list; tp; tp = tp->next) - if (ptid_get_pid (tp->ptid) == pid) - return tp; + /* Ensure we're looking at the right target stack. */ + gdb_assert (tp->inf == current_inferior ()); - return NULL; + return target_thread_alive (tp->ptid); } -struct thread_info * -any_live_thread_of_process (int pid) +/* Switch to thread TP if it is alive. Returns true if successfully + switched, false otherwise. */ + +static bool +switch_to_thread_if_alive (thread_info *thr) { - struct thread_info *tp; - struct thread_info *tp_executing = NULL; + scoped_restore_current_thread restore_thread; - for (tp = thread_list; tp; tp = tp->next) - if (tp->state_ != THREAD_EXITED && ptid_get_pid (tp->ptid) == pid) - { - if (tp->executing_) - tp_executing = tp; - else - return tp; - } + /* Switch inferior first, so that we're looking at the right target + stack. */ + switch_to_inferior_no_thread (thr->inf); - return tp_executing; -} + if (thread_alive (thr)) + { + switch_to_thread (thr); + restore_thread.dont_restore (); + return true; + } -/* Print a list of thread ids currently known, and the total number of - threads. To be used from within catch_errors. */ -static int -do_captured_list_thread_ids (struct ui_out *uiout, void *arg) -{ - struct thread_info *tp; - int num = 0; - struct cleanup *cleanup_chain; - int current_thread = -1; + return false; +} - update_thread_list (); +/* See gdbthreads.h. */ - cleanup_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "thread-ids"); +void +prune_threads (void) +{ + scoped_restore_current_thread restore_thread; - for (tp = thread_list; tp; tp = tp->next) + for (thread_info *tp : all_threads_safe ()) { - if (tp->state_ == THREAD_EXITED) - continue; + switch_to_inferior_no_thread (tp->inf); - if (ptid_equal (tp->ptid, inferior_ptid)) - current_thread = tp->num; - - num++; - ui_out_field_int (uiout, "thread-id", tp->num); + if (!thread_alive (tp)) + delete_thread (tp); } +} - do_cleanups (cleanup_chain); +/* See gdbthreads.h. */ - if (current_thread != -1) - ui_out_field_int (uiout, "current-thread-id", current_thread); - ui_out_field_int (uiout, "number-of-threads", num); - return GDB_RC_OK; +void +delete_exited_threads (void) +{ + for (thread_info *tp : all_threads_safe ()) + if (tp->state == THREAD_EXITED) + delete_thread (tp); } -/* Official gdblib interface function to get a list of thread ids and - the total number. */ -enum gdb_rc -gdb_list_thread_ids (struct ui_out *uiout, char **error_message) +/* Return true value if stack temporaries are enabled for the thread + TP. */ + +bool +thread_stack_temporaries_enabled_p (thread_info *tp) { - if (catch_exceptions_with_msg (uiout, do_captured_list_thread_ids, NULL, - error_message, RETURN_MASK_ALL) < 0) - return GDB_RC_FAIL; - return GDB_RC_OK; + if (tp == NULL) + return false; + else + return tp->stack_temporaries_enabled; } -/* Return true if TP is an active thread. */ -static int -thread_alive (struct thread_info *tp) +/* Push V on to the stack temporaries of the thread with id PTID. */ + +void +push_thread_stack_temporary (thread_info *tp, struct value *v) { - if (tp->state_ == THREAD_EXITED) - return 0; - if (!target_thread_alive (tp->ptid)) - return 0; - return 1; + gdb_assert (tp != NULL && tp->stack_temporaries_enabled); + tp->stack_temporaries.push_back (v); } -static void -prune_threads (void) +/* Return true if VAL is among the stack temporaries of the thread + TP. Return false otherwise. */ + +bool +value_in_thread_stack_temporaries (struct value *val, thread_info *tp) { - struct thread_info *tp, *next; + gdb_assert (tp != NULL && tp->stack_temporaries_enabled); + for (value *v : tp->stack_temporaries) + if (v == val) + return true; - for (tp = thread_list; tp; tp = next) - { - next = tp->next; - if (!thread_alive (tp)) - delete_thread (tp->ptid); - } + return false; +} + +/* Return the last of the stack temporaries for thread with id PTID. + Return NULL if there are no stack temporaries for the thread. */ + +value * +get_last_thread_stack_temporary (thread_info *tp) +{ + struct value *lastval = NULL; + + gdb_assert (tp != NULL); + if (!tp->stack_temporaries.empty ()) + lastval = tp->stack_temporaries.back (); + + return lastval; } void -thread_change_ptid (ptid_t old_ptid, ptid_t new_ptid) +thread_change_ptid (process_stratum_target *targ, + ptid_t old_ptid, ptid_t new_ptid) { struct inferior *inf; struct thread_info *tp; @@ -563,455 +802,558 @@ thread_change_ptid (ptid_t old_ptid, ptid_t new_ptid) /* It can happen that what we knew as the target inferior id changes. E.g, target remote may only discover the remote process pid after adding the inferior to GDB's list. */ - inf = find_inferior_pid (ptid_get_pid (old_ptid)); - inf->pid = ptid_get_pid (new_ptid); + inf = find_inferior_ptid (targ, old_ptid); + inf->pid = new_ptid.pid (); - tp = find_thread_ptid (old_ptid); + tp = find_thread_ptid (inf, old_ptid); tp->ptid = new_ptid; - observer_notify_thread_ptid_changed (old_ptid, new_ptid); + gdb::observers::thread_ptid_changed.notify (old_ptid, new_ptid); } +/* See gdbthread.h. */ + void -set_running (ptid_t ptid, int running) +set_resumed (process_stratum_target *targ, ptid_t ptid, bool resumed) { - struct thread_info *tp; - int all = ptid_equal (ptid, minus_one_ptid); - - /* We try not to notify the observer if no thread has actually changed - the running state -- merely to reduce the number of messages to - frontend. Frontend is supposed to handle multiple *running just fine. */ - if (all || ptid_is_pid (ptid)) - { - int any_started = 0; - - for (tp = thread_list; tp; tp = tp->next) - if (all || ptid_get_pid (tp->ptid) == ptid_get_pid (ptid)) - { - if (tp->state_ == THREAD_EXITED) - continue; - if (running && tp->state_ == THREAD_STOPPED) - any_started = 1; - tp->state_ = running ? THREAD_RUNNING : THREAD_STOPPED; - } - if (any_started) - observer_notify_target_resumed (ptid); - } - else - { - int started = 0; - - tp = find_thread_ptid (ptid); - gdb_assert (tp); - gdb_assert (tp->state_ != THREAD_EXITED); - if (running && tp->state_ == THREAD_STOPPED) - started = 1; - tp->state_ = running ? THREAD_RUNNING : THREAD_STOPPED; - if (started) - observer_notify_target_resumed (ptid); - } + for (thread_info *tp : all_non_exited_threads (targ, ptid)) + tp->resumed = resumed; } +/* Helper for set_running, that marks one thread either running or + stopped. */ + static int -is_thread_state (ptid_t ptid, enum thread_state state) +set_running_thread (struct thread_info *tp, int running) { - struct thread_info *tp; + int started = 0; - tp = find_thread_ptid (ptid); - gdb_assert (tp); - return tp->state_ == state; + if (running && tp->state == THREAD_STOPPED) + started = 1; + tp->state = running ? THREAD_RUNNING : THREAD_STOPPED; + + if (!running) + { + /* If the thread is now marked stopped, remove it from + the step-over queue, so that we don't try to resume + it until the user wants it to. */ + if (tp->step_over_next != NULL) + thread_step_over_chain_remove (tp); + } + + return started; } -int -is_stopped (ptid_t ptid) +/* See gdbthread.h. */ + +void +thread_info::set_running (bool running) { - return is_thread_state (ptid, THREAD_STOPPED); + if (set_running_thread (this, running)) + gdb::observers::target_resumed.notify (this->ptid); } -int -is_exited (ptid_t ptid) +void +set_running (process_stratum_target *targ, ptid_t ptid, bool running) { - return is_thread_state (ptid, THREAD_EXITED); + /* We try not to notify the observer if no thread has actually + changed the running state -- merely to reduce the number of + messages to the MI frontend. A frontend is supposed to handle + multiple *running notifications just fine. */ + bool any_started = false; + + for (thread_info *tp : all_non_exited_threads (targ, ptid)) + if (set_running_thread (tp, running)) + any_started = true; + + if (any_started) + gdb::observers::target_resumed.notify (ptid); } -int -is_running (ptid_t ptid) + +/* Helper for set_executing. Set's the thread's 'executing' field + from EXECUTING, and if EXECUTING is true also clears the thread's + stop_pc. */ + +static void +set_executing_thread (thread_info *thr, bool executing) { - return is_thread_state (ptid, THREAD_RUNNING); + thr->executing = executing; + if (executing) + thr->suspend.stop_pc = ~(CORE_ADDR) 0; } -int -any_running (void) +void +set_executing (process_stratum_target *targ, ptid_t ptid, bool executing) { - struct thread_info *tp; + for (thread_info *tp : all_non_exited_threads (targ, ptid)) + set_executing_thread (tp, executing); + + /* It only takes one running thread to spawn more threads. */ + if (executing) + targ->threads_executing = true; + /* Only clear the flag if the caller is telling us everything is + stopped. */ + else if (minus_one_ptid == ptid) + targ->threads_executing = false; +} - for (tp = thread_list; tp; tp = tp->next) - if (tp->state_ == THREAD_RUNNING) - return 1; +/* See gdbthread.h. */ - return 0; +bool +threads_are_executing (process_stratum_target *target) +{ + return target->threads_executing; } -int -is_executing (ptid_t ptid) +void +set_stop_requested (process_stratum_target *targ, ptid_t ptid, bool stop) { - struct thread_info *tp; + for (thread_info *tp : all_non_exited_threads (targ, ptid)) + tp->stop_requested = stop; - tp = find_thread_ptid (ptid); - gdb_assert (tp); - return tp->executing_; + /* Call the stop requested observer so other components of GDB can + react to this request. */ + if (stop) + gdb::observers::thread_stop_requested.notify (ptid); } void -set_executing (ptid_t ptid, int executing) +finish_thread_state (process_stratum_target *targ, ptid_t ptid) { - struct thread_info *tp; - int all = ptid_equal (ptid, minus_one_ptid); + bool any_started = false; - if (all || ptid_is_pid (ptid)) - { - for (tp = thread_list; tp; tp = tp->next) - if (all || ptid_get_pid (tp->ptid) == ptid_get_pid (ptid)) - tp->executing_ = executing; - } - else - { - tp = find_thread_ptid (ptid); - gdb_assert (tp); - tp->executing_ = executing; - } + for (thread_info *tp : all_non_exited_threads (targ, ptid)) + if (set_running_thread (tp, tp->executing)) + any_started = true; + + if (any_started) + gdb::observers::target_resumed.notify (ptid); } +/* See gdbthread.h. */ + void -set_stop_requested (ptid_t ptid, int stop) +validate_registers_access (void) { - struct thread_info *tp; - int all = ptid_equal (ptid, minus_one_ptid); + /* No selected thread, no registers. */ + if (inferior_ptid == null_ptid) + error (_("No thread selected.")); + + thread_info *tp = inferior_thread (); + + /* Don't try to read from a dead thread. */ + if (tp->state == THREAD_EXITED) + error (_("The current thread has terminated")); + + /* ... or from a spinning thread. FIXME: This isn't actually fully + correct. It'll allow an user-requested access (e.g., "print $pc" + at the prompt) when a thread is not executing for some internal + reason, but is marked running from the user's perspective. E.g., + the thread is waiting for its turn in the step-over queue. */ + if (tp->executing) + error (_("Selected thread is running.")); +} - if (all || ptid_is_pid (ptid)) - { - for (tp = thread_list; tp; tp = tp->next) - if (all || ptid_get_pid (tp->ptid) == ptid_get_pid (ptid)) - tp->stop_requested = stop; - } - else - { - tp = find_thread_ptid (ptid); - gdb_assert (tp); - tp->stop_requested = stop; - } +/* See gdbthread.h. */ - /* Call the stop requested observer so other components of GDB can - react to this request. */ - if (stop) - observer_notify_thread_stop_requested (ptid); +bool +can_access_registers_thread (thread_info *thread) +{ + /* No thread, no registers. */ + if (thread == NULL) + return false; + + /* Don't try to read from a dead thread. */ + if (thread->state == THREAD_EXITED) + return false; + + /* ... or from a spinning thread. FIXME: see validate_registers_access. */ + if (thread->executing) + return false; + + return true; } -void -finish_thread_state (ptid_t ptid) +int +pc_in_thread_step_range (CORE_ADDR pc, struct thread_info *thread) { - struct thread_info *tp; - int all; - int any_started = 0; + return (pc >= thread->control.step_range_start + && pc < thread->control.step_range_end); +} - all = ptid_equal (ptid, minus_one_ptid); +/* Helper for print_thread_info. Returns true if THR should be + printed. If REQUESTED_THREADS, a list of GDB ids/ranges, is not + NULL, only print THR if its ID is included in the list. GLOBAL_IDS + is true if REQUESTED_THREADS is list of global IDs, false if a list + of per-inferior thread ids. If PID is not -1, only print THR if it + is a thread from the process PID. Otherwise, threads from all + attached PIDs are printed. If both REQUESTED_THREADS is not NULL + and PID is not -1, then the thread is printed if it belongs to the + specified process. Otherwise, an error is raised. */ - if (all || ptid_is_pid (ptid)) +static int +should_print_thread (const char *requested_threads, int default_inf_num, + int global_ids, int pid, struct thread_info *thr) +{ + if (requested_threads != NULL && *requested_threads != '\0') { - for (tp = thread_list; tp; tp = tp->next) - { - if (tp->state_ == THREAD_EXITED) - continue; - if (all || ptid_get_pid (ptid) == ptid_get_pid (tp->ptid)) - { - if (tp->executing_ && tp->state_ == THREAD_STOPPED) - any_started = 1; - tp->state_ = tp->executing_ ? THREAD_RUNNING : THREAD_STOPPED; - } - } + int in_list; + + if (global_ids) + in_list = number_is_in_list (requested_threads, thr->global_num); + else + in_list = tid_is_in_list (requested_threads, default_inf_num, + thr->inf->num, thr->per_inf_num); + if (!in_list) + return 0; } - else + + if (pid != -1 && thr->ptid.pid () != pid) { - tp = find_thread_ptid (ptid); - gdb_assert (tp); - if (tp->state_ != THREAD_EXITED) - { - if (tp->executing_ && tp->state_ == THREAD_STOPPED) - any_started = 1; - tp->state_ = tp->executing_ ? THREAD_RUNNING : THREAD_STOPPED; - } + if (requested_threads != NULL && *requested_threads != '\0') + error (_("Requested thread not found in requested process")); + return 0; } - if (any_started) - observer_notify_target_resumed (ptid); -} + if (thr->state == THREAD_EXITED) + return 0; -void -finish_thread_state_cleanup (void *arg) -{ - ptid_t *ptid_p = arg; + return 1; +} - gdb_assert (arg); +/* Return the string to display in "info threads"'s "Target Id" + column, for TP. */ - finish_thread_state (*ptid_p); +static std::string +thread_target_id_str (thread_info *tp) +{ + std::string target_id = target_pid_to_str (tp->ptid); + const char *extra_info = target_extra_thread_info (tp); + const char *name = tp->name != nullptr ? tp->name : target_thread_name (tp); + + if (extra_info != nullptr && name != nullptr) + return string_printf ("%s \"%s\" (%s)", target_id.c_str (), name, + extra_info); + else if (extra_info != nullptr) + return string_printf ("%s (%s)", target_id.c_str (), extra_info); + else if (name != nullptr) + return string_printf ("%s \"%s\"", target_id.c_str (), name); + else + return target_id; } -/* Prints the list of threads and their details on UIOUT. - This is a version of 'info_threads_command' suitable for - use from MI. - If REQUESTED_THREAD is not -1, it's the GDB id of the thread - that should be printed. Otherwise, all threads are - printed. - If PID is not -1, only print threads from the process PID. - Otherwise, threads from all attached PIDs are printed. - If both REQUESTED_THREAD and PID are not -1, then the thread - is printed if it belongs to the specified process. Otherwise, - an error is raised. */ -void -print_thread_info (struct ui_out *uiout, char *requested_threads, int pid) +/* Like print_thread_info, but in addition, GLOBAL_IDS indicates + whether REQUESTED_THREADS is a list of global or per-inferior + thread ids. */ + +static void +print_thread_info_1 (struct ui_out *uiout, const char *requested_threads, + int global_ids, int pid, + int show_global_ids) { - struct thread_info *tp; - ptid_t current_ptid; - struct cleanup *old_chain; - char *extra_info, *name, *target_id; - int current_thread = -1; + int default_inf_num = current_inferior ()->num; update_thread_list (); - current_ptid = inferior_ptid; - /* We'll be switching threads temporarily. */ - old_chain = make_cleanup_restore_current_thread (); + /* Whether we saw any thread. */ + bool any_thread = false; + /* Whether the current thread is exited. */ + bool current_exited = false; - /* For backward compatibility, we make a list for MI. A table is - preferable for the CLI, though, because it shows table - headers. */ - if (ui_out_is_mi_like_p (uiout)) - make_cleanup_ui_out_list_begin_end (uiout, "threads"); - else - { - int n_threads = 0; + thread_info *current_thread = (inferior_ptid != null_ptid + ? inferior_thread () : NULL); - for (tp = thread_list; tp; tp = tp->next) - { - if (!number_is_in_list (requested_threads, tp->num)) - continue; + { + /* For backward compatibility, we make a list for MI. A table is + preferable for the CLI, though, because it shows table + headers. */ + gdb::optional list_emitter; + gdb::optional table_emitter; - if (pid != -1 && PIDGET (tp->ptid) != pid) - continue; + /* We'll be switching threads temporarily below. */ + scoped_restore_current_thread restore_thread; - if (tp->state_ == THREAD_EXITED) - continue; + if (uiout->is_mi_like_p ()) + list_emitter.emplace (uiout, "threads"); + else + { + int n_threads = 0; + /* The width of the "Target Id" column. Grown below to + accommodate the largest entry. */ + size_t target_id_col_width = 17; - ++n_threads; - } + for (thread_info *tp : all_threads ()) + { + if (!should_print_thread (requested_threads, default_inf_num, + global_ids, pid, tp)) + continue; - if (n_threads == 0) - { - if (requested_threads == NULL || *requested_threads == '\0') - ui_out_message (uiout, 0, _("No threads.\n")); - else - ui_out_message (uiout, 0, _("No threads match '%s'.\n"), - requested_threads); - do_cleanups (old_chain); - return; - } + if (!uiout->is_mi_like_p ()) + { + /* Switch inferiors so we're looking at the right + target stack. */ + switch_to_inferior_no_thread (tp->inf); - make_cleanup_ui_out_table_begin_end (uiout, 4, n_threads, "threads"); + target_id_col_width + = std::max (target_id_col_width, + thread_target_id_str (tp).size ()); + } - ui_out_table_header (uiout, 1, ui_left, "current", ""); - ui_out_table_header (uiout, 4, ui_left, "id", "Id"); - ui_out_table_header (uiout, 17, ui_left, "target-id", "Target Id"); - ui_out_table_header (uiout, 1, ui_left, "frame", "Frame"); - ui_out_table_body (uiout); - } + ++n_threads; + } - for (tp = thread_list; tp; tp = tp->next) - { - struct cleanup *chain2; - int core; + if (n_threads == 0) + { + if (requested_threads == NULL || *requested_threads == '\0') + uiout->message (_("No threads.\n")); + else + uiout->message (_("No threads match '%s'.\n"), + requested_threads); + return; + } - if (!number_is_in_list (requested_threads, tp->num)) - continue; + table_emitter.emplace (uiout, show_global_ids ? 5 : 4, + n_threads, "threads"); + + uiout->table_header (1, ui_left, "current", ""); + uiout->table_header (4, ui_left, "id-in-tg", "Id"); + if (show_global_ids) + uiout->table_header (4, ui_left, "id", "GId"); + uiout->table_header (target_id_col_width, ui_left, + "target-id", "Target Id"); + uiout->table_header (1, ui_left, "frame", "Frame"); + uiout->table_body (); + } - if (pid != -1 && PIDGET (tp->ptid) != pid) + for (inferior *inf : all_inferiors ()) + for (thread_info *tp : inf->threads ()) { - if (requested_threads != NULL && *requested_threads != '\0') - error (_("Requested thread not found in requested process")); - continue; - } + int core; - if (ptid_equal (tp->ptid, current_ptid)) - current_thread = tp->num; + any_thread = true; + if (tp == current_thread && tp->state == THREAD_EXITED) + current_exited = true; - if (tp->state_ == THREAD_EXITED) - continue; + if (!should_print_thread (requested_threads, default_inf_num, + global_ids, pid, tp)) + continue; - chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + ui_out_emit_tuple tuple_emitter (uiout, NULL); - if (ui_out_is_mi_like_p (uiout)) - { - /* Compatibility. */ - if (ptid_equal (tp->ptid, current_ptid)) - ui_out_text (uiout, "* "); - else - ui_out_text (uiout, " "); - } - else - { - if (ptid_equal (tp->ptid, current_ptid)) - ui_out_field_string (uiout, "current", "*"); - else - ui_out_field_skip (uiout, "current"); - } + if (!uiout->is_mi_like_p ()) + { + if (tp == current_thread) + uiout->field_string ("current", "*"); + else + uiout->field_skip ("current"); - ui_out_field_int (uiout, "id", tp->num); + uiout->field_string ("id-in-tg", print_thread_id (tp)); + } - /* 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 (show_global_ids || uiout->is_mi_like_p ()) + uiout->field_signed ("id", tp->global_num); - target_id = target_pid_to_str (tp->ptid); - extra_info = target_extra_thread_info (tp); - name = tp->name ? tp->name : target_thread_name (tp); + /* Switch to the thread (and inferior / target). */ + switch_to_thread (tp); - if (ui_out_is_mi_like_p (uiout)) - { - ui_out_field_string (uiout, "target-id", target_id); - if (extra_info) - ui_out_field_string (uiout, "details", extra_info); - if (name) - ui_out_field_string (uiout, "name", name); - } - else - { - struct cleanup *str_cleanup; - char *contents; - - if (extra_info && name) - contents = xstrprintf ("%s \"%s\" (%s)", target_id, - name, extra_info); - else if (extra_info) - contents = xstrprintf ("%s (%s)", target_id, extra_info); - else if (name) - contents = xstrprintf ("%s \"%s\"", target_id, name); + /* 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 ()) + { + 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 - contents = xstrdup (target_id); - str_cleanup = make_cleanup (xfree, contents); + { + uiout->field_string ("target-id", + thread_target_id_str (tp).c_str ()); + } - ui_out_field_string (uiout, "target-id", contents); - do_cleanups (str_cleanup); - } + if (tp->state == THREAD_RUNNING) + uiout->text ("(running)\n"); + else + { + /* The switch above put us at the top of the stack (leaf + frame). */ + print_stack_frame (get_selected_frame (NULL), + /* For MI output, print frame level. */ + uiout->is_mi_like_p (), + LOCATION, 0); + } - if (tp->state_ == THREAD_RUNNING) - ui_out_text (uiout, "(running)\n"); - else - { - /* The switch below puts us at the top of the stack (leaf - frame). */ - switch_to_thread (tp->ptid); - print_stack_frame (get_selected_frame (NULL), - /* For MI output, print frame level. */ - ui_out_is_mi_like_p (uiout), - LOCATION); - } + if (uiout->is_mi_like_p ()) + { + const char *state = "stopped"; - if (ui_out_is_mi_like_p (uiout)) - { - char *state = "stopped"; + if (tp->state == THREAD_RUNNING) + state = "running"; + uiout->field_string ("state", state); + } - if (tp->state_ == THREAD_RUNNING) - state = "running"; - ui_out_field_string (uiout, "state", state); + core = target_core_of_thread (tp->ptid); + if (uiout->is_mi_like_p () && core != -1) + uiout->field_signed ("core", core); } - core = target_core_of_thread (tp->ptid); - if (ui_out_is_mi_like_p (uiout) && core != -1) - ui_out_field_int (uiout, "core", core); + /* This end scope restores the current thread and the frame + selected before the "info threads" command, and it finishes the + ui-out list or table. */ + } - do_cleanups (chain2); + if (pid == -1 && requested_threads == NULL) + { + if (uiout->is_mi_like_p () && inferior_ptid != null_ptid) + uiout->field_signed ("current-thread-id", current_thread->global_num); + + if (inferior_ptid != null_ptid && current_exited) + uiout->message ("\n\ +The current thread has terminated. See `help thread'.\n", + print_thread_id (inferior_thread ())); + else if (any_thread && inferior_ptid == null_ptid) + uiout->message ("\n\ +No selected thread. See `help thread'.\n"); } +} - /* Restores the current thread and the frame selected before - the "info threads" command. */ - do_cleanups (old_chain); +/* See gdbthread.h. */ - if (pid == -1 && requested_threads == NULL) +void +print_thread_info (struct ui_out *uiout, const char *requested_threads, + int pid) +{ + 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 { + "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 + threads, which frees the frame cache. A no-side + effects info-threads command would be nicer. */ + +static void +info_threads_command (const char *arg, int from_tty) +{ + info_threads_opts it_opts; + + 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') { - gdb_assert (current_thread != -1 - || !thread_list - || ptid_equal (inferior_ptid, null_ptid)); - if (current_thread != -1 && ui_out_is_mi_like_p (uiout)) - ui_out_field_int (uiout, "current-thread-id", current_thread); - - if (current_thread != -1 && is_exited (current_ptid)) - ui_out_message (uiout, 0, "\n\ -The current thread has terminated. See `help thread'.\n", - current_thread); - else if (thread_list - && current_thread == -1 - && ptid_equal (current_ptid, null_ptid)) - ui_out_message (uiout, 0, "\n\ -No selected thread. See `help thread'.\n"); + 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 information about currently known threads +/* See gdbthread.h. */ - Optional ARG is a thread id, or list of thread ids. +void +switch_to_thread_no_regs (struct thread_info *thread) +{ + struct inferior *inf = thread->inf; - Note: this has the drawback that it _really_ switches - threads, which frees the frame cache. A no-side - effects info-threads command would be nicer. */ + set_current_program_space (inf->pspace); + set_current_inferior (inf); -static void -info_threads_command (char *arg, int from_tty) -{ - print_thread_info (uiout, arg, -1); + inferior_ptid = thread->ptid; } -/* Switch from one thread to another. */ +/* See gdbthread.h. */ void -switch_to_thread (ptid_t ptid) +switch_to_no_thread () { - /* Switch the program space as well, if we can infer it from the now - current thread. Otherwise, it's up to the caller to select the - space it wants. */ - if (!ptid_equal (ptid, null_ptid)) - { - struct inferior *inf; + if (inferior_ptid == null_ptid) + return; - inf = find_inferior_pid (ptid_get_pid (ptid)); - gdb_assert (inf != NULL); - set_current_program_space (inf->pspace); - set_current_inferior (inf); - } + inferior_ptid = null_ptid; + reinit_frame_cache (); +} + +/* See gdbthread.h. */ + +void +switch_to_thread (thread_info *thr) +{ + gdb_assert (thr != NULL); - if (ptid_equal (ptid, inferior_ptid)) + if (is_current_thread (thr)) return; - inferior_ptid = ptid; + switch_to_thread_no_regs (thr); + reinit_frame_cache (); - registers_changed (); - - /* We don't check for is_stopped, because we're called at times - while in the TARGET_RUNNING state, e.g., while handling an - internal event. */ - if (!ptid_equal (inferior_ptid, null_ptid) - && !is_exited (ptid) - && !is_executing (ptid)) - stop_pc = regcache_read_pc (get_thread_regcache (ptid)); - else - stop_pc = ~(CORE_ADDR) 0; } -static void -restore_current_thread (ptid_t ptid) +/* See gdbsupport/common-gdbthread.h. */ + +void +switch_to_thread (process_stratum_target *proc_target, ptid_t ptid) { - switch_to_thread (ptid); + thread_info *thr = find_thread_ptid (proc_target, ptid); + switch_to_thread (thr); } static void @@ -1061,87 +1403,80 @@ restore_selected_frame (struct frame_id a_frame_id, int frame_level) select_frame (get_current_frame ()); /* Warn the user. */ - if (frame_level > 0 && !ui_out_is_mi_like_p (uiout)) + if (frame_level > 0 && !current_uiout->is_mi_like_p ()) { warning (_("Couldn't restore frame #%d in " - "current thread, at reparsed frame #0\n"), + "current thread. Bottom (innermost) frame selected:"), frame_level); /* For MI, we should probably have a notification about current frame change. But this error is not very likely, so don't bother for now. */ - print_stack_frame (get_selected_frame (NULL), 1, SRC_LINE); + print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1); } } -struct current_thread_cleanup -{ - ptid_t inferior_ptid; - struct frame_id selected_frame_id; - int selected_frame_level; - int was_stopped; - int inf_id; -}; - -static void -do_restore_current_thread_cleanup (void *arg) +void +scoped_restore_current_thread::restore () { - struct thread_info *tp; - struct current_thread_cleanup *old = arg; - - tp = find_thread_ptid (old->inferior_ptid); - - /* If the previously selected thread belonged to a process that has - in the mean time been deleted (due to normal exit, detach, etc.), - then don't revert back to it, but instead simply drop back to no - thread selected. */ - if (tp - && find_inferior_pid (ptid_get_pid (tp->ptid)) != NULL) - restore_current_thread (old->inferior_ptid); + /* If an entry of thread_info was previously selected, it won't be + deleted because we've increased its refcount. The thread represented + by this thread_info entry may have already exited (due to normal exit, + detach, etc), so the thread_info.state is THREAD_EXITED. */ + if (m_thread != NULL + /* If the previously selected thread belonged to a process that has + in the mean time exited (or killed, detached, etc.), then don't revert + back to it, but instead simply drop back to no thread selected. */ + && m_inf->pid != 0) + switch_to_thread (m_thread); else { - restore_current_thread (null_ptid); - set_current_inferior (find_inferior_id (old->inf_id)); + switch_to_no_thread (); + set_current_inferior (m_inf); } /* The running state of the originally selected thread may have changed, so we have to recheck it here. */ - if (!ptid_equal (inferior_ptid, null_ptid) - && old->was_stopped - && is_stopped (inferior_ptid) + if (inferior_ptid != null_ptid + && m_was_stopped + && m_thread->state == THREAD_STOPPED && target_has_registers && target_has_stack && target_has_memory) - restore_selected_frame (old->selected_frame_id, - old->selected_frame_level); + restore_selected_frame (m_selected_frame_id, m_selected_frame_level); } -static void -restore_current_thread_cleanup_dtor (void *arg) +scoped_restore_current_thread::~scoped_restore_current_thread () { - struct current_thread_cleanup *old = arg; - struct thread_info *tp; + if (!m_dont_restore) + { + try + { + restore (); + } + catch (const gdb_exception &ex) + { + /* We're in a dtor, there's really nothing else we can do + but swallow the exception. */ + } + } - tp = find_thread_ptid (old->inferior_ptid); - if (tp) - tp->refcount--; - xfree (old); + if (m_thread != NULL) + m_thread->decref (); + m_inf->decref (); } -struct cleanup * -make_cleanup_restore_current_thread (void) +scoped_restore_current_thread::scoped_restore_current_thread () { - struct thread_info *tp; - struct frame_info *frame; - struct current_thread_cleanup *old; - - old = xmalloc (sizeof (struct current_thread_cleanup)); - old->inferior_ptid = inferior_ptid; - old->inf_id = current_inferior ()->num; + m_thread = NULL; + m_inf = current_inferior (); - if (!ptid_equal (inferior_ptid, null_ptid)) + if (inferior_ptid != null_ptid) { - old->was_stopped = is_stopped (inferior_ptid); - if (old->was_stopped + thread_info *tp = inferior_thread (); + struct frame_info *frame; + + m_was_stopped = tp->state == THREAD_STOPPED; + if (m_was_stopped && target_has_registers && target_has_stack && target_has_memory) @@ -1156,155 +1491,467 @@ make_cleanup_restore_current_thread (void) else frame = NULL; - old->selected_frame_id = get_frame_id (frame); - old->selected_frame_level = frame_relative_level (frame); + m_selected_frame_id = get_frame_id (frame); + m_selected_frame_level = frame_relative_level (frame); + + tp->incref (); + m_thread = tp; + } + + m_inf->incref (); +} + +/* See gdbthread.h. */ + +int +show_thread_that_caused_stop (void) +{ + return highest_thread_num > 1; +} + +/* See gdbthread.h. */ + +int +show_inferior_qualified_tids (void) +{ + return (inferior_list->next != NULL || inferior_list->num != 1); +} + +/* See gdbthread.h. */ + +const char * +print_thread_id (struct thread_info *thr) +{ + char *s = get_print_cell (); + + if (show_inferior_qualified_tids ()) + xsnprintf (s, PRINT_CELL_SIZE, "%d.%d", thr->inf->num, thr->per_inf_num); + else + xsnprintf (s, PRINT_CELL_SIZE, "%d", thr->per_inf_num); + return s; +} + +/* Sort an array of struct thread_info pointers by thread ID (first by + inferior number, and then by per-inferior thread number). Sorts in + ascending order. */ + +static bool +tp_array_compar_ascending (const thread_info *a, const thread_info *b) +{ + if (a->inf->num != b->inf->num) + return a->inf->num < b->inf->num; + + return (a->per_inf_num < b->per_inf_num); +} + +/* Sort an array of struct thread_info pointers by thread ID (first by + inferior number, and then by per-inferior thread number). Sorts in + descending order. */ + +static bool +tp_array_compar_descending (const thread_info *a, const thread_info *b) +{ + if (a->inf->num != b->inf->num) + return a->inf->num > b->inf->num; + + return (a->per_inf_num > b->per_inf_num); +} + +/* Switch to thread THR and execute CMD. + FLAGS.QUIET controls the printing of the thread information. + FLAGS.CONT and FLAGS.SILENT control how to handle errors. */ - tp = find_thread_ptid (inferior_ptid); - if (tp) - tp->refcount++; +static void +thr_try_catch_cmd (thread_info *thr, const char *cmd, int from_tty, + const qcs_flags &flags) +{ + switch_to_thread (thr); + try + { + std::string cmd_result = execute_command_to_string + (cmd, from_tty, gdb_stdout->term_out ()); + if (!flags.silent || cmd_result.length () > 0) + { + if (!flags.quiet) + printf_filtered (_("\nThread %s (%s):\n"), + print_thread_id (thr), + target_pid_to_str (inferior_ptid).c_str ()); + printf_filtered ("%s", cmd_result.c_str ()); + } + } + catch (const gdb_exception_error &ex) + { + if (!flags.silent) + { + if (!flags.quiet) + printf_filtered (_("\nThread %s (%s):\n"), + print_thread_id (thr), + target_pid_to_str (inferior_ptid).c_str ()); + if (flags.cont) + printf_filtered ("%s\n", ex.what ()); + else + throw; + } } +} + +/* Option definition of "thread apply"'s "-ascending" option. */ + +static const gdb::option::flag_option_def<> ascending_option_def = { + "ascending", + N_("\ +Call COMMAND for all threads in ascending order.\n\ +The default is descending order."), +}; + +/* The qcs command line flags for the "thread apply" commands. Keep + this in sync with the "frame apply" commands. */ + +using qcs_flag_option_def + = gdb::option::flag_option_def; + +static const gdb::option::option_def thr_qcs_flags_option_defs[] = { + qcs_flag_option_def { + "q", [] (qcs_flags *opt) { return &opt->quiet; }, + N_("Disables printing the thread information."), + }, + + qcs_flag_option_def { + "c", [] (qcs_flags *opt) { return &opt->cont; }, + N_("Print any error raised by COMMAND and continue."), + }, + + qcs_flag_option_def { + "s", [] (qcs_flags *opt) { return &opt->silent; }, + N_("Silently ignore any errors or empty output produced by COMMAND."), + }, +}; + +/* Create an option_def_group for the "thread apply all" options, with + ASCENDING and FLAGS as context. */ + +static inline std::array +make_thread_apply_all_options_def_group (bool *ascending, + qcs_flags *flags) +{ + return {{ + { {ascending_option_def.def ()}, ascending}, + { {thr_qcs_flags_option_defs}, flags }, + }}; +} - return make_cleanup_dtor (do_restore_current_thread_cleanup, old, - restore_current_thread_cleanup_dtor); +/* Create an option_def_group for the "thread apply" options, with + FLAGS as context. */ + +static inline gdb::option::option_def_group +make_thread_apply_options_def_group (qcs_flags *flags) +{ + return {{thr_qcs_flags_option_defs}, flags}; } /* Apply a GDB command to a list of threads. List syntax is a whitespace - seperated list of numbers, or ranges, or the keyword `all'. Ranges consist - of two numbers seperated by a hyphen. Examples: + separated list of numbers, or ranges, or the keyword `all'. Ranges consist + of two numbers separated by a hyphen. Examples: thread apply 1 2 7 4 backtrace Apply backtrace cmd to threads 1,2,7,4 thread apply 2-7 9 p foo(1) Apply p foo(1) cmd to threads 2->7 & 9 - thread apply all p x/i $pc Apply x/i $pc cmd to all threads. */ + thread apply all x/i $pc Apply x/i $pc cmd to all threads. */ static void -thread_apply_all_command (char *cmd, int from_tty) +thread_apply_all_command (const char *cmd, int from_tty) { - struct thread_info *tp; - struct cleanup *old_chain; - char *saved_cmd; + bool ascending = false; + qcs_flags flags; + + auto group = make_thread_apply_all_options_def_group (&ascending, + &flags); + gdb::option::process_options + (&cmd, gdb::option::PROCESS_OPTIONS_UNKNOWN_IS_OPERAND, group); + + validate_flags_qcs ("thread apply all", &flags); if (cmd == NULL || *cmd == '\000') - error (_("Please specify a command following the thread ID list")); + error (_("Please specify a command at the end of 'thread apply all'")); update_thread_list (); - old_chain = make_cleanup_restore_current_thread (); + int tc = live_threads_count (); + if (tc != 0) + { + /* Save a copy of the thread list and increment each thread's + refcount while executing the command in the context of each + thread, in case the command is one that wipes threads. E.g., + detach, kill, disconnect, etc., or even normally continuing + over an inferior or thread exit. */ + std::vector thr_list_cpy; + thr_list_cpy.reserve (tc); + + for (thread_info *tp : all_non_exited_threads ()) + thr_list_cpy.push_back (tp); + gdb_assert (thr_list_cpy.size () == tc); + + /* Increment the refcounts, and restore them back on scope + exit. */ + scoped_inc_dec_ref inc_dec_ref (thr_list_cpy); + + auto *sorter = (ascending + ? tp_array_compar_ascending + : tp_array_compar_descending); + std::sort (thr_list_cpy.begin (), thr_list_cpy.end (), sorter); + + scoped_restore_current_thread restore_thread; + + for (thread_info *thr : thr_list_cpy) + if (switch_to_thread_if_alive (thr)) + thr_try_catch_cmd (thr, cmd, from_tty, flags); + } +} + +/* Completer for "thread apply [ID list]". */ - /* Save a copy of the command in case it is clobbered by - execute_command. */ - saved_cmd = xstrdup (cmd); - make_cleanup (xfree, saved_cmd); - for (tp = thread_list; tp; tp = tp->next) - if (thread_alive (tp)) - { - switch_to_thread (tp->ptid); +static void +thread_apply_command_completer (cmd_list_element *ignore, + completion_tracker &tracker, + const char *text, const char * /*word*/) +{ + /* Don't leave this to complete_options because there's an early + return below. */ + tracker.set_use_custom_word_point (true); - printf_filtered (_("\nThread %d (%s):\n"), - tp->num, target_pid_to_str (inferior_ptid)); - execute_command (cmd, from_tty); - strcpy (cmd, saved_cmd); /* Restore exact command used - previously. */ - } + tid_range_parser parser; + parser.init (text, current_inferior ()->num); + + try + { + while (!parser.finished ()) + { + int inf_num, thr_start, thr_end; + + if (!parser.get_tid_range (&inf_num, &thr_start, &thr_end)) + break; + + if (parser.in_star_range () || parser.in_thread_range ()) + parser.skip_range (); + } + } + catch (const gdb_exception_error &ex) + { + /* get_tid_range throws if it parses a negative number, for + example. But a seemingly negative number may be the start of + an option instead. */ + } + + const char *cmd = parser.cur_tok (); + + if (cmd == text) + { + /* No thread ID list yet. */ + return; + } + + /* Check if we're past a valid thread ID list already. */ + if (parser.finished () + && cmd > text && !isspace (cmd[-1])) + return; + + /* We're past the thread ID list, advance word point. */ + tracker.advance_custom_word_point_by (cmd - text); + text = cmd; + + const auto group = make_thread_apply_options_def_group (nullptr); + if (gdb::option::complete_options + (tracker, &text, gdb::option::PROCESS_OPTIONS_UNKNOWN_IS_OPERAND, group)) + return; + + complete_nested_command_line (tracker, text); +} + +/* Completer for "thread apply all". */ + +static void +thread_apply_all_command_completer (cmd_list_element *ignore, + completion_tracker &tracker, + const char *text, const char *word) +{ + const auto group = make_thread_apply_all_options_def_group (nullptr, + nullptr); + if (gdb::option::complete_options + (tracker, &text, gdb::option::PROCESS_OPTIONS_UNKNOWN_IS_OPERAND, group)) + return; - do_cleanups (old_chain); + complete_nested_command_line (tracker, text); } +/* Implementation of the "thread apply" command. */ + static void -thread_apply_command (char *tidlist, int from_tty) +thread_apply_command (const char *tidlist, int from_tty) { - char *cmd; - struct cleanup *old_chain; - char *saved_cmd; - struct get_number_or_range_state state; + qcs_flags flags; + const char *cmd = NULL; + tid_range_parser parser; if (tidlist == NULL || *tidlist == '\000') error (_("Please specify a thread ID list")); - for (cmd = tidlist; *cmd != '\000' && !isalpha (*cmd); cmd++); + parser.init (tidlist, current_inferior ()->num); + while (!parser.finished ()) + { + int inf_num, thr_start, thr_end; + + if (!parser.get_tid_range (&inf_num, &thr_start, &thr_end)) + break; + } + + cmd = parser.cur_tok (); + + auto group = make_thread_apply_options_def_group (&flags); + gdb::option::process_options + (&cmd, gdb::option::PROCESS_OPTIONS_UNKNOWN_IS_OPERAND, group); - if (*cmd == '\000') + validate_flags_qcs ("thread apply", &flags); + + if (*cmd == '\0') error (_("Please specify a command following the thread ID list")); - /* Save a copy of the command in case it is clobbered by - execute_command. */ - saved_cmd = xstrdup (cmd); - old_chain = make_cleanup (xfree, saved_cmd); + if (tidlist == cmd || isdigit (cmd[0])) + invalid_thread_id_error (cmd); + + scoped_restore_current_thread restore_thread; - init_number_or_range (&state, tidlist); - while (!state.finished && state.string < cmd) + parser.init (tidlist, current_inferior ()->num); + while (!parser.finished ()) { - struct thread_info *tp; - int start; - char *p = tidlist; + struct thread_info *tp = NULL; + struct inferior *inf; + int inf_num, thr_num; - start = get_number_or_range (&state); + parser.get_tid (&inf_num, &thr_num); + inf = find_inferior_id (inf_num); + if (inf != NULL) + tp = find_thread_id (inf, thr_num); - make_cleanup_restore_current_thread (); + if (parser.in_star_range ()) + { + if (inf == NULL) + { + warning (_("Unknown inferior %d"), inf_num); + parser.skip_range (); + continue; + } - tp = find_thread_id (start); + /* No use looking for threads past the highest thread number + the inferior ever had. */ + if (thr_num >= inf->highest_thread_num) + parser.skip_range (); - if (!tp) - warning (_("Unknown thread %d."), start); - else if (!thread_alive (tp)) - warning (_("Thread %d has terminated."), start); - else - { - switch_to_thread (tp->ptid); + /* Be quiet about unknown threads numbers. */ + if (tp == NULL) + continue; + } - printf_filtered (_("\nThread %d (%s):\n"), tp->num, - target_pid_to_str (inferior_ptid)); - execute_command (cmd, from_tty); + if (tp == NULL) + { + if (show_inferior_qualified_tids () || parser.tid_is_qualified ()) + warning (_("Unknown thread %d.%d"), inf_num, thr_num); + else + warning (_("Unknown thread %d"), thr_num); + continue; + } - /* Restore exact command used previously. */ - strcpy (cmd, saved_cmd); + if (!switch_to_thread_if_alive (tp)) + { + warning (_("Thread %s has terminated."), print_thread_id (tp)); + continue; } + + thr_try_catch_cmd (tp, cmd, from_tty, flags); } +} + - do_cleanups (old_chain); +/* Implementation of the "taas" command. */ + +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); } -/* Switch to the specified thread. Will dispatch off to thread_apply_command - if prefix of arg is `apply'. */ +/* Implementation of the "tfaas" command. */ static void -thread_command (char *tidstr, int from_tty) +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); +} + +/* Switch to the specified thread, or print the current thread. */ + +void +thread_command (const char *tidstr, int from_tty) { - if (!tidstr) + if (tidstr == NULL) { - if (ptid_equal (inferior_ptid, null_ptid)) + if (inferior_ptid == null_ptid) error (_("No thread selected")); if (target_has_stack) { - if (is_exited (inferior_ptid)) - printf_filtered (_("[Current thread is %d (%s) (exited)]\n"), - pid_to_thread_id (inferior_ptid), - target_pid_to_str (inferior_ptid)); + struct thread_info *tp = inferior_thread (); + + if (tp->state == THREAD_EXITED) + printf_filtered (_("[Current thread is %s (%s) (exited)]\n"), + print_thread_id (tp), + target_pid_to_str (inferior_ptid).c_str ()); else - printf_filtered (_("[Current thread is %d (%s)]\n"), - pid_to_thread_id (inferior_ptid), - target_pid_to_str (inferior_ptid)); + printf_filtered (_("[Current thread is %s (%s)]\n"), + print_thread_id (tp), + target_pid_to_str (inferior_ptid).c_str ()); } else error (_("No stack.")); - return; } + else + { + ptid_t previous_ptid = inferior_ptid; - gdb_thread_select (uiout, tidstr, NULL); + thread_select (tidstr, parse_thread_id (tidstr, NULL)); + + /* Print if the thread has not changed, otherwise an event will + be sent. */ + if (inferior_ptid == previous_ptid) + { + print_selected_thread_frame (current_uiout, + USER_SELECTED_THREAD + | USER_SELECTED_FRAME); + } + else + { + gdb::observers::user_selected_context_changed.notify + (USER_SELECTED_THREAD | USER_SELECTED_FRAME); + } + } } /* Implementation of `thread name'. */ static void -thread_name_command (char *arg, int from_tty) +thread_name_command (const char *arg, int from_tty) { struct thread_info *info; - if (ptid_equal (inferior_ptid, null_ptid)) + if (inferior_ptid == null_ptid) error (_("No thread selected")); - while (arg && isspace (*arg)) - ++arg; + arg = skip_spaces (arg); info = inferior_thread (); xfree (info->name); @@ -1314,10 +1961,9 @@ thread_name_command (char *arg, int from_tty) /* Find thread ids with a name, target pid, or extra info matching ARG. */ static void -thread_find_command (char *arg, int from_tty) +thread_find_command (const char *arg, int from_tty) { - struct thread_info *tp; - char *tmp; + const char *tmp; unsigned long match = 0; if (arg == NULL || *arg == '\0') @@ -1328,36 +1974,36 @@ thread_find_command (char *arg, int from_tty) error (_("Invalid regexp (%s): %s"), tmp, arg); update_thread_list (); - for (tp = thread_list; tp; tp = tp->next) + for (thread_info *tp : all_threads ()) { if (tp->name != NULL && re_exec (tp->name)) { - printf_filtered (_("Thread %d has name '%s'\n"), - tp->num, tp->name); + printf_filtered (_("Thread %s has name '%s'\n"), + print_thread_id (tp), tp->name); match++; } tmp = target_thread_name (tp); if (tmp != NULL && re_exec (tmp)) { - printf_filtered (_("Thread %d has target name '%s'\n"), - tp->num, tmp); + printf_filtered (_("Thread %s has target name '%s'\n"), + print_thread_id (tp), tmp); match++; } - tmp = target_pid_to_str (tp->ptid); - if (tmp != NULL && re_exec (tmp)) + std::string name = target_pid_to_str (tp->ptid); + if (!name.empty () && re_exec (name.c_str ())) { - printf_filtered (_("Thread %d has target id '%s'\n"), - tp->num, tmp); + printf_filtered (_("Thread %s has target id '%s'\n"), + print_thread_id (tp), name.c_str ()); match++; } tmp = target_extra_thread_info (tp); if (tmp != NULL && re_exec (tmp)) { - printf_filtered (_("Thread %d has extra info '%s'\n"), - tp->num, tmp); + printf_filtered (_("Thread %s has extra info '%s'\n"), + print_thread_id (tp), tmp); match++; } } @@ -1366,112 +2012,265 @@ thread_find_command (char *arg, int 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) + struct cmd_list_element *c, const char *value) { fprintf_filtered (file, _("Printing of thread events is %s.\n"), - value); + value); } -static int -do_captured_thread_select (struct ui_out *uiout, void *tidstr) -{ - int num; - struct thread_info *tp; - - num = value_as_long (parse_and_eval (tidstr)); - - tp = find_thread_id (num); +/* See gdbthread.h. */ - if (!tp) - error (_("Thread ID %d not known."), num); +void +thread_select (const char *tidstr, thread_info *tp) +{ + if (!switch_to_thread_if_alive (tp)) + error (_("Thread ID %s has terminated."), tidstr); - if (!thread_alive (tp)) - error (_("Thread ID %d has terminated."), num); + annotate_thread_changed (); - switch_to_thread (tp->ptid); + /* Since the current thread may have changed, see if there is any + exited thread we can now delete. */ + prune_threads (); +} - annotate_thread_changed (); +/* Print thread and frame switch command response. */ - ui_out_text (uiout, "[Switching to thread "); - ui_out_field_int (uiout, "new-thread-id", pid_to_thread_id (inferior_ptid)); - ui_out_text (uiout, " ("); - ui_out_text (uiout, target_pid_to_str (inferior_ptid)); - ui_out_text (uiout, ")]"); +void +print_selected_thread_frame (struct ui_out *uiout, + user_selected_what selection) +{ + struct thread_info *tp = inferior_thread (); - /* Note that we can't reach this with an exited thread, due to the - thread_alive check above. */ - if (tp->state_ == THREAD_RUNNING) - ui_out_text (uiout, "(running)\n"); - else + if (selection & USER_SELECTED_THREAD) { - ui_out_text (uiout, "\n"); - print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC); + if (uiout->is_mi_like_p ()) + { + uiout->field_signed ("new-thread-id", + inferior_thread ()->global_num); + } + else + { + uiout->text ("[Switching to thread "); + uiout->field_string ("new-thread-id", print_thread_id (tp)); + uiout->text (" ("); + uiout->text (target_pid_to_str (inferior_ptid).c_str ()); + uiout->text (")]"); + } } - /* Since the current thread may have changed, see if there is any - exited thread we can now delete. */ - prune_threads (); + if (tp->state == THREAD_RUNNING) + { + if (selection & USER_SELECTED_THREAD) + uiout->text ("(running)\n"); + } + else if (selection & USER_SELECTED_FRAME) + { + if (selection & USER_SELECTED_THREAD) + uiout->text ("\n"); - return GDB_RC_OK; + if (has_stack_frames ()) + print_stack_frame_to_uiout (uiout, get_selected_frame (NULL), + 1, SRC_AND_LOC, 1); + } } -enum gdb_rc -gdb_thread_select (struct ui_out *uiout, char *tidstr, char **error_message) +/* Update the 'threads_executing' global based on the threads we know + about right now. This is used by infrun to tell whether we should + pull events out of the current target. */ + +static void +update_threads_executing (void) { - if (catch_exceptions_with_msg (uiout, do_captured_thread_select, tidstr, - error_message, RETURN_MASK_ALL) < 0) - return GDB_RC_FAIL; - return GDB_RC_OK; + process_stratum_target *targ = current_inferior ()->process_target (); + + if (targ == NULL) + return; + + targ->threads_executing = false; + + for (inferior *inf : all_non_exited_inferiors (targ)) + { + if (!inf->has_execution ()) + continue; + + /* If the process has no threads, then it must be we have a + process-exit event pending. */ + if (inf->thread_list == NULL) + { + targ->threads_executing = true; + return; + } + + for (thread_info *tp : inf->non_exited_threads ()) + { + if (tp->executing) + { + targ->threads_executing = true; + return; + } + } + } } void update_thread_list (void) { - prune_threads (); - target_find_new_threads (); + target_update_thread_list (); + update_threads_executing (); +} + +/* Return a new value for the selected thread's id. Return a value of + 0 if no thread is selected. If GLOBAL is true, return the thread's + global number. Otherwise return the per-inferior number. */ + +static struct value * +thread_num_make_value_helper (struct gdbarch *gdbarch, int global) +{ + int int_val; + + if (inferior_ptid == null_ptid) + int_val = 0; + else + { + thread_info *tp = inferior_thread (); + if (global) + int_val = tp->global_num; + else + int_val = tp->per_inf_num; + } + + return value_from_longest (builtin_type (gdbarch)->builtin_int, int_val); } -/* Return a new value for the selected thread's id. Return a value of 0 if - no thread is selected, or no threads exist. */ +/* Return a new value for the selected thread's per-inferior thread + number. Return a value of 0 if no thread is selected, or no + threads exist. */ static struct value * -thread_id_make_value (struct gdbarch *gdbarch, struct internalvar *var) +thread_id_per_inf_num_make_value (struct gdbarch *gdbarch, + struct internalvar *var, + void *ignore) { - struct thread_info *tp = find_thread_ptid (inferior_ptid); + return thread_num_make_value_helper (gdbarch, 0); +} + +/* Return a new value for the selected thread's global id. Return a + value of 0 if no thread is selected, or no threads exist. */ - return value_from_longest (builtin_type (gdbarch)->builtin_int, - (tp ? tp->num : 0)); +static struct value * +global_thread_id_make_value (struct gdbarch *gdbarch, struct internalvar *var, + void *ignore) +{ + return thread_num_make_value_helper (gdbarch, 1); } /* Commands with a prefix of `thread'. */ struct cmd_list_element *thread_cmd_list = NULL; +/* Implementation of `thread' variable. */ + +static const struct internalvar_funcs thread_funcs = +{ + thread_id_per_inf_num_make_value, + NULL, + NULL +}; + +/* Implementation of `gthread' variable. */ + +static const struct internalvar_funcs gthread_funcs = +{ + global_thread_id_make_value, + NULL, + NULL +}; + void _initialize_thread (void) { static struct cmd_list_element *thread_apply_list = NULL; - - add_info ("threads", info_threads_command, - _("Display currently known threads.\n\ -Usage: info threads [ID]...\n\ -Optional arguments are thread IDs with spaces between.\n\ -If no arguments, all threads are displayed.")); + cmd_list_element *c; + + 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."), + 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\ The new thread ID must be currently known."), &thread_cmd_list, "thread ", 1, &cmdlist); - add_prefix_cmd ("apply", class_run, thread_apply_command, - _("Apply a command to a list of threads."), - &thread_apply_list, "thread apply ", 1, &thread_cmd_list); - - add_cmd ("all", class_run, thread_apply_all_command, - _("Apply a command to all threads."), &thread_apply_list); +#define THREAD_APPLY_OPTION_HELP "\ +Prints per-inferior thread number and target system's thread id\n\ +followed by COMMAND output.\n\ +\n\ +By default, an error raised during the execution of COMMAND\n\ +aborts \"thread apply\".\n\ +\n\ +Options:\n\ +%OPTIONS%" + + const auto thread_apply_opts = make_thread_apply_options_def_group (nullptr); + + 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" +THREAD_APPLY_OPTION_HELP), + thread_apply_opts); + + c = add_prefix_cmd ("apply", class_run, thread_apply_command, + thread_apply_help.c_str (), + &thread_apply_list, "thread apply ", 1, + &thread_cmd_list); + set_cmd_completer_handle_brkchars (c, thread_apply_command_completer); + + 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 (_("\ +Apply a command to all threads.\n\ +\n\ +Usage: thread apply all [OPTION]... COMMAND\n" +THREAD_APPLY_OPTION_HELP), + thread_apply_all_opts); + + c = add_cmd ("all", class_run, thread_apply_all_command, + thread_apply_all_help.c_str (), + &thread_apply_list); + set_cmd_completer_handle_brkchars (c, thread_apply_all_command_completer); + + c = add_com ("taas", class_run, taas_command, _("\ +Apply a command to all threads (ignoring errors and empty output).\n\ +Usage: taas [OPTION]... COMMAND\n\ +shortcut for 'thread apply all -s [OPTION]... COMMAND'\n\ +See \"help thread apply all\" for available options.")); + set_cmd_completer_handle_brkchars (c, thread_apply_all_command_completer); + + c = add_com ("tfaas", class_run, tfaas_command, _("\ +Apply a command to all frames of all threads (ignoring errors and empty output).\n\ +Usage: tfaas [OPTION]... COMMAND\n\ +shortcut for 'thread apply all -s -- frame apply all -s [OPTION]... COMMAND'\n\ +See \"help frame apply all\" for available options.")); + set_cmd_completer_handle_brkchars (c, frame_apply_all_cmd_completer); add_cmd ("name", class_run, thread_name_command, _("Set the current thread's name.\n\ @@ -1484,16 +2283,16 @@ Usage: thread find REGEXP\n\ Will display thread ids whose name, target ID, or extra info matches REGEXP."), &thread_cmd_list); - if (!xdb_commands) - add_com_alias ("t", "thread", class_run, 1); + add_com_alias ("t", "thread", class_run, 1); add_setshow_boolean_cmd ("thread-events", no_class, - &print_thread_events, _("\ + &print_thread_events, _("\ Set printing of thread events (such as thread start and exit)."), _("\ Show printing of thread events (such as thread start and exit)."), NULL, - NULL, - show_print_thread_events, - &setprintlist, &showprintlist); + NULL, + show_print_thread_events, + &setprintlist, &showprintlist); - create_internalvar_type_lazy ("_thread", thread_id_make_value); + create_internalvar_type_lazy ("_thread", &thread_funcs, NULL); + create_internalvar_type_lazy ("_gthread", >hread_funcs, NULL); }