/* 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-2019 Free Software Foundation, Inc.
Contributed by Lynx Real-Time Systems, Inc. Los Gatos, CA.
#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 <ctype.h>
#include <sys/types.h>
#include <signal.h>
#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 "thread-fsm.h"
+#include "tid-parse.h"
+#include <algorithm>
+#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);
+/* True if any thread is, or may be executing. We need to track this
+ separately because until we fully sync the thread list, we won't
+ know whether the target is fully stopped, even if we see stop
+ events for all known threads, because any of those threads may have
+ spawned new threads we haven't heard of yet. */
+static int threads_executing;
+
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<thread_info *> &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<thread_info *> &m_thrds;
};
+
struct thread_info*
inferior_thread (void)
{
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;
}
}
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->ptid);
}
+/* 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);
- xfree (tp);
+ /* Tag it as exited. */
+ tp->state = THREAD_EXITED;
+
+ /* 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_map.clear();
+ }
}
-/* 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;
+ thread_info *tp = new thread_info (inf, ptid);
- tp = xcalloc (1, sizeof (*tp));
+ /* A thread with this ptid should not exist yet. */
+ gdb_assert (inf->thread_map.find (ptid) == inf->thread_map.end ());
- tp->ptid = ptid;
- tp->num = ++highest_thread_num;
- tp->next = thread_list;
- thread_list = tp;
-
- /* Nothing to follow yet. */
- tp->pending_follow.kind = TARGET_WAITKIND_SPURIOUS;
- tp->state_ = THREAD_STOPPED;
+ inf->thread_map[ptid] = tp;
return tp;
}
struct thread_info *
add_thread_silent (ptid_t ptid)
{
- struct thread_info *tp;
+ struct inferior *inf = find_inferior_ptid (ptid);
+ gdb_assert (inf != NULL);
- tp = find_thread_ptid (ptid);
+ thread_info *tp = find_thread_ptid (inf, 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.
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 (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);
+ delete_thread (tp);
}
- 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 (ptid_t ptid, private_thread_info *priv)
{
struct thread_info *result = add_thread_silent (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;
return add_thread_with_info (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);
+}
+/* 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 && ptid != inferior_ptid;
+}
+
+/* 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;
+
+ tp->step_over_prev = tail;
+ tp->step_over_next = head;
+ head->step_over_prev = tp;
+ tail->step_over_next = tp;
+ }
+}
- /* Tag it as exited. */
- tp->state_ = THREAD_EXITED;
+/* Remove TP from step-over chain LIST_P. */
- /* Clear breakpoints, etc. associated with this thread. */
- clear_thread_inferior_resources (tp);
- }
+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, bool remove)
+{
+ gdb_assert (thr != nullptr);
+
+ set_thread_exited (thr, silent);
+ if (!thr->deletable ())
+ {
/* Will be really deleted some other time. */
return;
}
- if (tpprev)
- tpprev->next = tp->next;
- else
- 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);
+ if (remove)
+ {
+ size_t nr_deleted = thr->inf->thread_map.erase(thr->ptid);
+ gdb_assert (nr_deleted == 1);
+ }
- free_thread (tp);
+ delete thr;
}
-/* 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 (thread_info *thread)
+{
+ 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 (ptid_t ptid)
+delete_thread_silent (thread_info *thread)
{
- delete_thread_1 (ptid, 0 /* not silent */);
+ delete_thread_1 (thread, true /* silent */, true /* remove */);
}
void
-delete_thread_silent (ptid_t ptid)
+delete_thread_silent_noremove (thread_info *thread)
{
- delete_thread_1 (ptid, 1 /* silent */);
+ delete_thread_1 (thread, true /* silent */, false /* don't remove */);
}
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;
- for (tp = thread_list; tp; tp = tp->next)
- if (tp->num == num)
+ return NULL;
+}
+
+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. */
+
struct thread_info *
find_thread_ptid (ptid_t ptid)
{
- struct thread_info *tp;
+ inferior *inf = find_inferior_ptid (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))
- return tp;
+/* See gdbthread.h. */
- return NULL;
+struct thread_info *
+find_thread_ptid (inferior *inf, ptid_t ptid)
+{
+ auto it = inf->thread_map.find (ptid);
+ if (it != inf->thread_map.end ())
+ return it->second;
+ else
+ return nullptr;
+}
+
+/* See gdbthread.h. */
+
+struct thread_info *
+find_thread_by_handle (gdb::array_view<const gdb_byte> handle,
+ struct inferior *inf)
+{
+ return target_thread_handle_to_thread_info (handle.data (),
+ handle.size (),
+ inf);
}
/*
* 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.
*/
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;
}
-int
-thread_count (void)
-{
- int result = 0;
- struct thread_info *tp;
-
- for (tp = thread_list; tp; tp = tp->next)
- ++result;
+/* See gdbthread.h. */
- return result;
+bool
+any_thread_p ()
+{
+ for (thread_info *tp ATTRIBUTE_UNUSED : all_threads ())
+ return true;
+ return false;
}
int
-valid_thread_id (int num)
+thread_count (void)
{
- struct thread_info *tp;
+ auto rng = all_threads ();
+ return std::distance (rng.begin (), rng.end ());
+}
- for (tp = thread_list; tp; tp = tp->next)
- if (tp->num == num)
- return 1;
+/* Return the number of non-exited threads in the thread list. */
- return 0;
+static int
+live_threads_count (void)
+{
+ auto rng = all_non_exited_threads ();
+ return std::distance (rng.begin (), rng.end ());
}
int
-pid_to_thread_id (ptid_t ptid)
+valid_global_thread_id (int global_id)
{
- struct thread_info *tp;
-
- for (tp = thread_list; tp; tp = tp->next)
- if (ptid_equal (tp->ptid, ptid))
- return tp->num;
+ for (thread_info *tp : all_threads ())
+ if (tp->global_num == global_id)
+ return 1;
return 0;
}
-ptid_t
-thread_id_to_pid (int num)
-{
- struct thread_info *thread = find_thread_id (num);
-
- if (thread)
- return thread->ptid;
- else
- return pid_to_ptid (-1);
-}
-
int
in_thread_list (ptid_t ptid)
{
- struct thread_info *tp;
-
- for (tp = thread_list; tp; tp = tp->next)
- if (ptid_equal (tp->ptid, ptid))
- return 1;
-
- return 0; /* Never heard of 'im. */
+ return find_thread_ptid (ptid) != nullptr;
}
-/* Finds the first thread of the inferior given by PID. If PID is -1,
- return the first thread in the list. */
+/* Finds the first thread of the inferior. */
-struct thread_info *
-first_thread_of_process (int pid)
+thread_info *
+first_thread_of_inferior (inferior *inf)
{
- struct thread_info *tp, *ret = NULL;
+ gdb_assert (!inf->thread_map.empty ());
- 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;
+ 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 ret;
+ return it->second;
}
-struct thread_info *
-any_thread_of_process (int pid)
+thread_info *
+any_thread_of_inferior (inferior *inf)
{
- struct thread_info *tp;
-
- for (tp = thread_list; tp; tp = tp->next)
- if (ptid_get_pid (tp->ptid) == pid)
- return tp;
-
- return NULL;
-}
+ gdb_assert (inf->pid != 0);
-struct thread_info *
-any_live_thread_of_process (int pid)
-{
- struct thread_info *tp;
- struct thread_info *tp_running = NULL;
+ /* Prefer the current thread. */
+ if (inf == current_inferior ())
+ return inferior_thread ();
- for (tp = thread_list; tp; tp = tp->next)
- if (ptid_get_pid (tp->ptid) == pid)
- {
- if (tp->state_ == THREAD_STOPPED)
- return tp;
- else if (tp->state_ == THREAD_RUNNING)
- tp_running = tp;
- }
+ for (thread_info *tp : inf->non_exited_threads ())
+ return tp;
- return tp_running;
+ return NULL;
}
-/* 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)
+thread_info *
+any_live_thread_of_inferior (inferior *inf)
{
- struct thread_info *tp;
- int num = 0;
- struct cleanup *cleanup_chain;
- int current_thread = -1;
-
- update_thread_list ();
+ struct thread_info *curr_tp = NULL;
+ struct thread_info *tp_executing = NULL;
- cleanup_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "thread-ids");
+ gdb_assert (inf != NULL && inf->pid != 0);
- for (tp = thread_list; tp; tp = tp->next)
+ /* Prefer the current thread if it's not executing. */
+ if (inferior_ptid != null_ptid && current_inferior () == inf)
{
- if (tp->state_ == THREAD_EXITED)
- continue;
+ /* 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;
+ }
- if (ptid_equal (tp->ptid, inferior_ptid))
- current_thread = tp->num;
+ for (thread_info *tp : inf->non_exited_threads ())
+ {
+ if (!tp->executing)
+ return tp;
- num++;
- ui_out_field_int (uiout, "thread-id", tp->num);
+ tp_executing = tp;
}
- do_cleanups (cleanup_chain);
-
- 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;
-}
+ /* If both the current thread and all live threads are executing,
+ prefer the current thread. */
+ if (curr_tp != NULL)
+ return curr_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)
-{
- 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;
+ /* Otherwise, just return an executing thread, if any. */
+ return tp_executing;
}
/* Return true if TP is an active thread. */
static int
thread_alive (struct thread_info *tp)
{
- if (tp->state_ == THREAD_EXITED)
+ if (tp->state == THREAD_EXITED)
return 0;
if (!target_thread_alive (tp->ptid))
return 0;
return 1;
}
-static void
+/* See gdbthreads.h. */
+
+void
prune_threads (void)
{
- struct thread_info *tp, *next;
+ for (thread_info *tp : all_threads_safe ())
+ if (!thread_alive (tp))
+ delete_thread (tp);
+}
- for (tp = thread_list; tp; tp = next)
- {
- next = tp->next;
- if (!thread_alive (tp))
- delete_thread (tp->ptid);
- }
+/* See gdbthreads.h. */
+
+void
+delete_exited_threads (void)
+{
+ for (thread_info *tp : all_threads_safe ())
+ if (tp->state == THREAD_EXITED)
+ delete_thread (tp);
+}
+
+/* Return true value if stack temporaries are enabled for the thread
+ TP. */
+
+bool
+thread_stack_temporaries_enabled_p (thread_info *tp)
+{
+ if (tp == NULL)
+ return false;
+ else
+ return tp->stack_temporaries_enabled;
+}
+
+/* Push V on to the stack temporaries of the thread with id PTID. */
+
+void
+push_thread_stack_temporary (thread_info *tp, struct value *v)
+{
+ gdb_assert (tp != NULL && tp->stack_temporaries_enabled);
+ tp->stack_temporaries.push_back (v);
+}
+
+/* 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)
+{
+ gdb_assert (tp != NULL && tp->stack_temporaries_enabled);
+ for (value *v : tp->stack_temporaries)
+ if (v == val)
+ return true;
+
+ 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
/* 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 (old_ptid);
+ 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 = find_thread_ptid (old_ptid);
tp->ptid = new_ptid;
+ inf->thread_map[new_ptid] = tp;
- 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 (ptid_t ptid, int 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 (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;
-int
-is_stopped (ptid_t ptid)
-{
- return is_thread_state (ptid, 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);
+ }
-int
-is_exited (ptid_t ptid)
-{
- return is_thread_state (ptid, THREAD_EXITED);
+ return started;
}
-int
-is_running (ptid_t ptid)
+/* See gdbthread.h. */
+
+void
+thread_info::set_running (bool running)
{
- return is_thread_state (ptid, THREAD_RUNNING);
+ if (set_running_thread (this, running))
+ gdb::observers::target_resumed.notify (this->ptid);
}
-int
-any_running (void)
+void
+set_running (ptid_t ptid, int running)
{
- struct thread_info *tp;
+ /* 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 (tp = thread_list; tp; tp = tp->next)
- if (tp->state_ == THREAD_RUNNING)
- return 1;
+ for (thread_info *tp : all_non_exited_threads (ptid))
+ if (set_running_thread (tp, running))
+ any_started = true;
- return 0;
+ if (any_started)
+ gdb::observers::target_resumed.notify (ptid);
}
-int
-is_executing (ptid_t ptid)
-{
- struct thread_info *tp;
- tp = find_thread_ptid (ptid);
- gdb_assert (tp);
- return tp->executing_;
+/* 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)
+{
+ thr->executing = executing;
+ if (executing)
+ thr->suspend.stop_pc = ~(CORE_ADDR) 0;
}
void
set_executing (ptid_t ptid, int executing)
{
- struct thread_info *tp;
- int all = ptid_equal (ptid, minus_one_ptid);
+ for (thread_info *tp : all_non_exited_threads (ptid))
+ set_executing_thread (tp, executing);
+
+ /* It only takes one running thread to spawn more threads. */
+ if (executing)
+ threads_executing = 1;
+ /* Only clear the flag if the caller is telling us everything is
+ stopped. */
+ else if (minus_one_ptid == ptid)
+ threads_executing = 0;
+}
- 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;
- }
+/* See gdbthread.h. */
+
+int
+threads_are_executing (void)
+{
+ return threads_executing;
}
void
set_stop_requested (ptid_t ptid, int stop)
{
- struct thread_info *tp;
- int all = ptid_equal (ptid, minus_one_ptid);
-
- 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;
- }
+ for (thread_info *tp : all_non_exited_threads (ptid))
+ tp->stop_requested = stop;
/* Call the stop requested observer so other components of GDB can
react to this request. */
if (stop)
- observer_notify_thread_stop_requested (ptid);
+ gdb::observers::thread_stop_requested.notify (ptid);
}
void
finish_thread_state (ptid_t ptid)
{
- struct thread_info *tp;
- int all;
- int any_started = 0;
+ bool any_started = false;
- all = ptid_equal (ptid, minus_one_ptid);
-
- if (all || ptid_is_pid (ptid))
- {
- 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;
- }
- }
- }
- else
- {
- 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;
- }
- }
+ for (thread_info *tp : all_non_exited_threads (ptid))
+ if (set_running_thread (tp, tp->executing))
+ any_started = true;
if (any_started)
- observer_notify_target_resumed (ptid);
+ gdb::observers::target_resumed.notify (ptid);
}
+/* See gdbthread.h. */
+
void
-finish_thread_state_cleanup (void *arg)
+validate_registers_access (void)
{
- ptid_t *ptid_p = arg;
+ /* 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."));
+}
+
+/* See gdbthread.h. */
+
+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;
- gdb_assert (arg);
+ /* ... or from a spinning thread. FIXME: see validate_registers_access. */
+ if (thread->executing)
+ return false;
- finish_thread_state (*ptid_p);
+ return true;
}
-/* Prints the list of threads and their details on UIOUT.
- This is a version of 'info_thread_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, int requested_thread, int pid)
+int
+pc_in_thread_step_range (CORE_ADDR pc, struct thread_info *thread)
{
- struct thread_info *tp;
- ptid_t current_ptid;
- struct cleanup *old_chain;
- char *extra_info;
- int current_thread = -1;
+ return (pc >= thread->control.step_range_start
+ && pc < thread->control.step_range_end);
+}
- update_thread_list ();
- current_ptid = inferior_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. */
+
+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')
+ {
+ int in_list;
- /* We'll be switching threads temporarily. */
- old_chain = make_cleanup_restore_current_thread ();
+ 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;
+ }
- /* 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
+ if (pid != -1 && thr->ptid.pid () != pid)
{
- int n_threads = 0;
+ if (requested_threads != NULL && *requested_threads != '\0')
+ error (_("Requested thread not found in requested process"));
+ return 0;
+ }
- for (tp = thread_list; tp; tp = tp->next)
- {
- if (requested_thread != -1 && tp->num != requested_thread)
- continue;
+ if (thr->state == THREAD_EXITED)
+ return 0;
- if (pid != -1 && PIDGET (tp->ptid) != pid)
- continue;
+ return 1;
+}
- if (tp->state_ == THREAD_EXITED)
- continue;
+/* Return the string to display in "info threads"'s "Target Id"
+ column, for TP. */
- ++n_threads;
- }
+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;
+}
- if (n_threads == 0)
- {
- if (requested_thread == -1)
- ui_out_message (uiout, 0, _("No threads.\n"));
- else
- ui_out_message (uiout, 0, _("No thread %d.\n"), requested_thread);
- do_cleanups (old_chain);
- return;
- }
+/* Like print_thread_info, but in addition, GLOBAL_IDS indicates
+ whether REQUESTED_THREADS is a list of global or per-inferior
+ thread ids. */
- make_cleanup_ui_out_table_begin_end (uiout, 5, n_threads, "threads");
+static void
+print_thread_info_1 (struct ui_out *uiout, const char *requested_threads,
+ int global_ids, int pid,
+ int show_global_ids)
+{
+ int default_inf_num = current_inferior ()->num;
- 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_noalign, "details", "");
- ui_out_table_header (uiout, 1, ui_left, "frame", "Frame");
- ui_out_table_body (uiout);
- }
+ update_thread_list ();
- for (tp = thread_list; tp; tp = tp->next)
- {
- struct cleanup *chain2;
- int core;
+ /* Whether we saw any thread. */
+ bool any_thread = false;
+ /* Whether the current thread is exited. */
+ bool current_exited = false;
- if (requested_thread != -1 && tp->num != requested_thread)
- continue;
+ thread_info *current_thread = (inferior_ptid != null_ptid
+ ? inferior_thread () : NULL);
- if (pid != -1 && PIDGET (tp->ptid) != pid)
- {
- if (requested_thread != -1)
- error (_("Requested thread not found in requested process"));
- 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<ui_out_emit_list> list_emitter;
+ gdb::optional<ui_out_emit_table> table_emitter;
- if (ptid_equal (tp->ptid, current_ptid))
- current_thread = tp->num;
+ 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;
- if (tp->state_ == THREAD_EXITED)
- continue;
+ for (thread_info *tp : all_threads ())
+ {
+ if (!should_print_thread (requested_threads, default_inf_num,
+ global_ids, pid, tp))
+ continue;
- chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
+ if (!uiout->is_mi_like_p ())
+ {
+ target_id_col_width
+ = std::max (target_id_col_width,
+ thread_target_id_str (tp).size ());
+ }
- 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");
- }
+ ++n_threads;
+ }
- ui_out_field_int (uiout, "id", tp->num);
- ui_out_field_string (uiout, "target-id", target_pid_to_str (tp->ptid));
+ 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;
+ }
- extra_info = target_extra_thread_info (tp);
- if (extra_info)
- {
- ui_out_text (uiout, " (");
- ui_out_field_string (uiout, "details", extra_info);
- ui_out_text (uiout, ")");
- }
- else if (! ui_out_is_mi_like_p (uiout))
- ui_out_field_skip (uiout, "details");
+ 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 (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);
- }
+ /* We'll be switching threads temporarily. */
+ scoped_restore_current_thread restore_thread;
- if (ui_out_is_mi_like_p (uiout))
- {
- char *state = "stopped";
+ for (inferior *inf : all_inferiors ())
+ {
+ /* Print the threads in per-inferior number order. */
+ std::vector<thread_info *> threads_to_print;
- if (tp->state_ == THREAD_RUNNING)
- state = "running";
- ui_out_field_string (uiout, "state", state);
- }
+ for (thread_info *tp : inf->threads ())
+ threads_to_print.push_back (tp);
- core = target_core_of_thread (tp->ptid);
- if (ui_out_is_mi_like_p (uiout) && core != -1)
- ui_out_field_int (uiout, "core", core);
+ 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;
+ });
- do_cleanups (chain2);
- }
+ for (thread_info *tp : threads_to_print)
+ {
+ int core;
+
+ any_thread = true;
+ if (tp == current_thread && tp->state == THREAD_EXITED)
+ current_exited = true;
+
+ if (!should_print_thread (requested_threads, default_inf_num,
+ global_ids, pid, tp))
+ continue;
+
+ ui_out_emit_tuple tuple_emitter (uiout, NULL);
+
+ if (!uiout->is_mi_like_p ())
+ {
+ if (tp == current_thread)
+ uiout->field_string ("current", "*");
+ else
+ uiout->field_skip ("current");
+
+ uiout->field_string ("id-in-tg", print_thread_id (tp));
+ }
+
+ if (show_global_ids || uiout->is_mi_like_p ())
+ uiout->field_signed ("id", tp->global_num);
+
+ /* 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
+ {
+ uiout->field_string ("target-id",
+ thread_target_id_str (tp).c_str ());
+ }
+
+ 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);
+ }
+
+ if (uiout->is_mi_like_p ())
+ {
+ const char *state = "stopped";
+
+ 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);
+ }
+ }
- /* Restores the current thread and the frame selected before
- the "info threads" command. */
- do_cleanups (old_chain);
+ /* 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. */
+ }
- if (pid == -1 && requested_thread == -1)
+ if (pid == -1 && requested_threads == NULL)
{
- 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 <Thread ID %d> 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\
+ 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 <Thread ID %s> 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");
}
}
+/* See gdbthread.h. */
+
+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. */
-/* Print information about currently known threads
+struct info_threads_opts
+{
+ /* For "-gid". */
+ bool show_global_ids = false;
+};
- * 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 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
+ threads, which frees the frame cache. A no-side
+ effects info-threads command would be nicer. */
static void
-info_threads_command (char *arg, int from_tty)
+info_threads_command (const char *arg, int from_tty)
{
- print_thread_info (uiout, -1, -1);
+ 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);
}
-/* Switch from one thread to another. */
+/* Completer for the "info threads" command. */
-void
-switch_to_thread (ptid_t ptid)
+static void
+info_threads_command_completer (struct cmd_list_element *ignore,
+ completion_tracker &tracker,
+ const char *text, const char *word_ignored)
{
- /* 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;
+ const auto grp = make_info_threads_options_def_group (nullptr);
- inf = find_inferior_pid (ptid_get_pid (ptid));
- gdb_assert (inf != NULL);
- set_current_program_space (inf->pspace);
- set_current_inferior (inf);
+ 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::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"));
}
+}
+
+/* See gdbthread.h. */
+
+void
+switch_to_thread_no_regs (struct thread_info *thread)
+{
+ struct inferior *inf = thread->inf;
+
+ set_current_program_space (inf->pspace);
+ set_current_inferior (inf);
+
+ inferior_ptid = thread->ptid;
+}
+
+/* See gdbthread.h. */
+
+void
+switch_to_no_thread ()
+{
+ if (inferior_ptid == null_ptid)
+ return;
+
+ inferior_ptid = null_ptid;
+ reinit_frame_cache ();
+}
+
+/* See gdbthread.h. */
- if (ptid_equal (ptid, inferior_ptid))
+void
+switch_to_thread (thread_info *thr)
+{
+ gdb_assert (thr != NULL);
+
+ if (inferior_ptid == thr->ptid)
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 (ptid_t ptid)
{
- switch_to_thread (ptid);
+ thread_info *thr = find_thread_ptid (ptid);
+ switch_to_thread (thr);
}
static void
struct frame_info *frame = NULL;
int count;
+ /* This means there was no selected frame. */
+ if (frame_level == -1)
+ {
+ select_frame (NULL);
+ return;
+ }
+
gdb_assert (frame_level >= 0);
/* Restore by level first, check if the frame id is the same as
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)
+scoped_restore_current_thread::~scoped_restore_current_thread ()
{
- 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)
-{
- struct current_thread_cleanup *old = arg;
- struct thread_info *tp;
-
- 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)
- frame = get_selected_frame (NULL);
+ {
+ /* When processing internal events, there might not be a
+ selected frame. If we naively call get_selected_frame
+ here, then we can end up reading debuginfo for the
+ current frame, but we don't generally need the debuginfo
+ at this point. */
+ frame = get_selected_frame_if_set ();
+ }
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."),
+};
- return make_cleanup_dtor (do_restore_current_thread_cleanup, old,
- restore_current_thread_cleanup_dtor);
+/* 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<qcs_flags>;
+
+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<gdb::option::option_def_group, 2>
+make_thread_apply_all_options_def_group (bool *ascending,
+ qcs_flags *flags)
+{
+ return {{
+ { {ascending_option_def.def ()}, ascending},
+ { {thr_qcs_flags_option_defs}, flags },
+ }};
+}
+
+/* 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<thread_info *> 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 (thread_alive (thr))
+ thr_try_catch_cmd (thr, cmd, from_tty, flags);
+ }
+}
- /* 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);
+/* Completer for "thread apply [ID list]". */
- 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. */
- }
+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);
+
+ 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;
- do_cleanups (old_chain);
+ 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;
+
+ 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;
- char *p;
- struct cleanup *old_chain;
- char *saved_cmd;
+ 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);
- while (tidlist < cmd)
- {
- struct thread_info *tp;
- int start, end;
+ if (tidlist == cmd || isdigit (cmd[0]))
+ invalid_thread_id_error (cmd);
- start = strtol (tidlist, &p, 10);
- if (p == tidlist)
- error (_("Error parsing %s"), tidlist);
- tidlist = p;
+ scoped_restore_current_thread restore_thread;
- while (*tidlist == ' ' || *tidlist == '\t')
- tidlist++;
+ parser.init (tidlist, current_inferior ()->num);
+ while (!parser.finished ())
+ {
+ struct thread_info *tp = NULL;
+ struct inferior *inf;
+ int inf_num, thr_num;
- if (*tidlist == '-') /* Got a range of IDs? */
+ parser.get_tid (&inf_num, &thr_num);
+ inf = find_inferior_id (inf_num);
+ if (inf != NULL)
+ tp = find_thread_id (inf, thr_num);
+
+ if (parser.in_star_range ())
{
- tidlist++; /* Skip the - */
- end = strtol (tidlist, &p, 10);
- if (p == tidlist)
- error (_("Error parsing %s"), tidlist);
- tidlist = p;
-
- while (*tidlist == ' ' || *tidlist == '\t')
- tidlist++;
- }
- else
- end = start;
+ if (inf == NULL)
+ {
+ warning (_("Unknown inferior %d"), inf_num);
+ parser.skip_range ();
+ continue;
+ }
- make_cleanup_restore_current_thread ();
+ /* No use looking for threads past the highest thread number
+ the inferior ever had. */
+ if (thr_num >= inf->highest_thread_num)
+ parser.skip_range ();
- for (; start <= end; start++)
- {
- tp = find_thread_id (start);
+ /* Be quiet about unknown threads numbers. */
+ if (tp == NULL)
+ continue;
+ }
- if (!tp)
- warning (_("Unknown thread %d."), start);
- else if (!thread_alive (tp))
- warning (_("Thread %d has terminated."), start);
+ if (tp == NULL)
+ {
+ if (show_inferior_qualified_tids () || parser.tid_is_qualified ())
+ warning (_("Unknown thread %d.%d"), inf_num, thr_num);
else
- {
- switch_to_thread (tp->ptid);
-
- printf_filtered (_("\nThread %d (%s):\n"), tp->num,
- target_pid_to_str (inferior_ptid));
- execute_command (cmd, from_tty);
+ warning (_("Unknown thread %d"), thr_num);
+ continue;
+ }
- /* Restore exact command used previously. */
- strcpy (cmd, saved_cmd);
- }
+ if (!thread_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 (!tidstr)
+ 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 == 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;
+
+ thread_select (tidstr, parse_thread_id (tidstr, NULL));
- gdb_thread_select (uiout, 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);
+ }
+ }
}
-/* Print notices when new threads are attached and detached. */
-int print_thread_events = 1;
+/* Implementation of `thread name'. */
+
static void
-show_print_thread_events (struct ui_file *file, int from_tty,
- struct cmd_list_element *c, const char *value)
+thread_name_command (const char *arg, int from_tty)
{
- fprintf_filtered (file,
- _("Printing of thread events is %s.\n"),
- value);
+ struct thread_info *info;
+
+ if (inferior_ptid == null_ptid)
+ error (_("No thread selected"));
+
+ arg = skip_spaces (arg);
+
+ info = inferior_thread ();
+ xfree (info->name);
+ info->name = arg ? xstrdup (arg) : NULL;
}
-static int
-do_captured_thread_select (struct ui_out *uiout, void *tidstr)
+/* Find thread ids with a name, target pid, or extra info matching ARG. */
+
+static void
+thread_find_command (const char *arg, int from_tty)
{
- int num;
- struct thread_info *tp;
+ const char *tmp;
+ unsigned long match = 0;
- num = value_as_long (parse_and_eval (tidstr));
+ if (arg == NULL || *arg == '\0')
+ error (_("Command requires an argument."));
- tp = find_thread_id (num);
+ tmp = re_comp (arg);
+ if (tmp != 0)
+ error (_("Invalid regexp (%s): %s"), tmp, arg);
- if (!tp)
- error (_("Thread ID %d not known."), num);
+ update_thread_list ();
+ for (thread_info *tp : all_threads ())
+ {
+ if (tp->name != NULL && re_exec (tp->name))
+ {
+ printf_filtered (_("Thread %s has name '%s'\n"),
+ print_thread_id (tp), tp->name);
+ match++;
+ }
- if (!thread_alive (tp))
- error (_("Thread ID %d has terminated."), num);
+ tmp = target_thread_name (tp);
+ if (tmp != NULL && re_exec (tmp))
+ {
+ printf_filtered (_("Thread %s has target name '%s'\n"),
+ print_thread_id (tp), tmp);
+ match++;
+ }
- switch_to_thread (tp->ptid);
+ std::string name = target_pid_to_str (tp->ptid);
+ if (!name.empty () && re_exec (name.c_str ()))
+ {
+ printf_filtered (_("Thread %s has target id '%s'\n"),
+ print_thread_id (tp), name.c_str ());
+ match++;
+ }
- annotate_thread_changed ();
+ tmp = target_extra_thread_info (tp);
+ if (tmp != NULL && re_exec (tmp))
+ {
+ printf_filtered (_("Thread %s has extra info '%s'\n"),
+ print_thread_id (tp), tmp);
+ match++;
+ }
+ }
+ if (!match)
+ printf_filtered (_("No threads match '%s'\n"), arg);
+}
- 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, ")]");
+/* Print notices when new threads are attached and detached. */
+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)
+{
+ fprintf_filtered (file,
+ _("Printing of thread events is %s.\n"),
+ value);
+}
- /* 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
- print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC);
+/* See gdbthread.h. */
+
+void
+thread_select (const char *tidstr, thread_info *tp)
+{
+ if (!thread_alive (tp))
+ error (_("Thread ID %s has terminated."), tidstr);
+
+ switch_to_thread (tp);
+
+ annotate_thread_changed ();
/* Since the current thread may have changed, see if there is any
exited thread we can now delete. */
prune_threads ();
+}
+
+/* Print thread and frame switch command response. */
+
+void
+print_selected_thread_frame (struct ui_out *uiout,
+ user_selected_what selection)
+{
+ struct thread_info *tp = inferior_thread ();
+
+ if (selection & USER_SELECTED_THREAD)
+ {
+ 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 (")]");
+ }
+ }
- return GDB_RC_OK;
+ 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");
+
+ 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. */
+
+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;
+ threads_executing = 0;
+ for (thread_info *tp : all_non_exited_threads ())
+ {
+ if (tp->executing)
+ {
+ threads_executing = 1;
+ break;
+ }
+ }
}
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, or no threads exist. */
+/* 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_id_make_value (struct gdbarch *gdbarch, struct internalvar *var)
+thread_num_make_value_helper (struct gdbarch *gdbarch, int global)
{
- struct thread_info *tp = find_thread_ptid (inferior_ptid);
+ 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 per-inferior thread
+ number. 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 *
+thread_id_per_inf_num_make_value (struct gdbarch *gdbarch,
+ struct internalvar *var,
+ void *ignore)
+{
+ 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. */
+
+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,
- _("IDs of currently known threads."));
+ 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);
-
- if (!xdb_commands)
- add_com_alias ("t", "thread", class_run, 1);
+#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\
+Usage: thread name [NAME]\n\
+If NAME is not given, then any existing name is removed."), &thread_cmd_list);
+
+ add_cmd ("find", class_run, thread_find_command, _("\
+Find threads that match a regular expression.\n\
+Usage: thread find REGEXP\n\
+Will display thread ids whose name, target ID, or extra info matches REGEXP."),
+ &thread_cmd_list);
+
+ 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);
}
projects / deliverable / binutils-gdb.git / blobdiff