/* Multi-process/thread control for GDB, the GNU debugger.
- Copyright (C) 1986-2017 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 <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 "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
+#include "inline-frame.h"
+#include "stack.h"
/* Definition of struct thread_info exported to gdbthread.h. */
/* Prototypes for local functions. */
-struct thread_info *thread_list = NULL;
static int highest_thread_num;
/* True if any thread is, or may be executing. We need to track this
spawned new threads we haven't heard of yet. */
static int threads_executing;
-static void thread_apply_all_command (char *, int);
static int thread_alive (struct thread_info *);
-static void info_threads_command (char *, int);
/* RAII type used to increase / decrease the refcount of each thread
in a given list of threads. */
int
thread_has_single_step_breakpoint_here (struct thread_info *tp,
- struct address_space *aspace,
+ const address_space *aspace,
CORE_ADDR addr)
{
struct breakpoint *ss_bps = tp->control.single_step_breakpoints;
{
if (thr->thread_fsm != NULL)
{
- thread_fsm_clean_up (thr->thread_fsm, thr);
- thread_fsm_delete (thr->thread_fsm);
+ thr->thread_fsm->clean_up (thr);
+ delete thr->thread_fsm;
thr->thread_fsm = NULL;
}
}
btrace_teardown (tp);
thread_cancel_execution_command (tp);
+
+ clear_inline_frame_state (tp->ptid);
}
/* Set the TP's state as exited. */
if (tp->state != THREAD_EXITED)
{
- observer_notify_thread_exit (tp, silent);
+ gdb::observers::thread_exit.notify (tp, silent);
/* Tag it as exited. */
tp->state = THREAD_EXITED;
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;
+ inferior *inf = tp->inf;
+
if (tp->deletable ())
delete tp;
else
set_thread_exited (tp, 1);
- }
- thread_list = NULL;
- threads_executing = 0;
+ inf->thread_map.clear();
+ }
}
/* Allocate a new thread of inferior INF with target id PTID and add
{
thread_info *tp = new thread_info (inf, ptid);
- if (thread_list == NULL)
- thread_list = tp;
- else
- {
- struct thread_info *last;
+ /* A thread with this ptid should not exist yet. */
+ gdb_assert (inf->thread_map.find (ptid) == inf->thread_map.end ());
- for (last = thread_list; last->next != NULL; last = last->next)
- ;
- last->next = tp;
- }
+ 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.
if (inferior_ptid == ptid)
{
- tp = new_thread (inf, 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 (inf, ptid);
- observer_notify_new_thread (tp);
+ gdb::observers::new_thread.notify (tp);
return tp;
}
struct thread_info *
-add_thread_with_info (ptid_t ptid, struct private_thread_info *priv)
+add_thread_with_info (ptid_t ptid, private_thread_info *priv)
{
struct thread_info *result = add_thread_silent (ptid);
- result->priv = priv;
+ 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);
}
+private_thread_info::~private_thread_info () = default;
+
thread_info::thread_info (struct inferior *inf_, ptid_t ptid_)
: ptid (ptid_), inf (inf_)
{
thread_info::~thread_info ()
{
- if (this->priv)
- {
- if (this->private_dtor)
- this->private_dtor (this->priv);
- else
- xfree (this->priv);
- }
-
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. */
+ return refcount () == 0 && ptid != inferior_ptid;
+}
+
/* Add TP to the end of the step-over chain LIST_P. */
static void
step_over_chain_remove (&step_over_queue_head, tp);
}
-/* Delete thread PTID. If SILENT, don't notify the observer of this
- exit. */
+/* 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 (ptid_t ptid, int silent)
+delete_thread_1 (thread_info *thr, bool silent, bool remove)
{
- struct thread_info *tp, *tpprev;
+ gdb_assert (thr != nullptr);
- tpprev = NULL;
-
- for (tp = thread_list; tp; tpprev = tp, tp = tp->next)
- if (tp->ptid == ptid)
- break;
-
- if (!tp)
- return;
+ set_thread_exited (thr, silent);
- set_thread_exited (tp, silent);
-
- if (!tp->deletable ())
+ if (!thr->deletable ())
{
/* Will be really deleted some other time. */
return;
}
- if (tpprev)
- tpprev->next = tp->next;
- else
- thread_list = tp->next;
+ if (remove)
+ {
+ size_t nr_deleted = thr->inf->thread_map.erase(thr->ptid);
+ gdb_assert (nr_deleted == 1);
+ }
- delete tp;
+ delete thr;
}
-/* Delete thread 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_global_id (int global_id)
{
- struct thread_info *tp;
-
- for (tp = thread_list; tp; tp = tp->next)
+ for (thread_info *tp : all_threads ())
if (tp->global_num == global_id)
return tp;
static struct thread_info *
find_thread_id (struct inferior *inf, int thr_num)
{
- struct thread_info *tp;
-
- for (tp = thread_list; tp; tp = tp->next)
- if (tp->inf == inf && tp->per_inf_num == thr_num)
+ for (thread_info *tp : inf->threads ())
+ if (tp->per_inf_num == thr_num)
return tp;
return NULL;
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 (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 (struct value *thread_handle, struct inferior *inf)
+find_thread_by_handle (gdb::array_view<const gdb_byte> handle,
+ struct inferior *inf)
{
- return target_thread_handle_to_thread_info
- (value_contents_all (thread_handle),
- TYPE_LENGTH (value_type (thread_handle)),
- inf);
+ return target_thread_handle_to_thread_info (handle.data (),
+ handle.size (),
+ inf);
}
/*
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)
{
- int result = 0;
- struct thread_info *tp;
-
- for (tp = thread_list; tp; tp = tp->next)
- ++result;
-
- return result;
+ auto rng = all_threads ();
+ return std::distance (rng.begin (), rng.end ());
}
/* Return the number of non-exited threads in the thread list. */
static int
live_threads_count (void)
{
- int result = 0;
- struct thread_info *tp;
-
- ALL_NON_EXITED_THREADS (tp)
- ++result;
-
- return result;
+ auto rng = all_non_exited_threads ();
+ return std::distance (rng.begin (), rng.end ());
}
int
valid_global_thread_id (int global_id)
{
- struct thread_info *tp;
-
- for (tp = thread_list; tp; tp = tp->next)
+ for (thread_info *tp : all_threads ())
if (tp->global_num == global_id)
return 1;
return 0;
}
-int
-ptid_to_global_thread_id (ptid_t ptid)
-{
- struct thread_info *tp;
-
- for (tp = thread_list; tp; tp = tp->next)
- if (tp->ptid == ptid)
- return tp->global_num;
-
- return 0;
-}
-
-ptid_t
-global_thread_id_to_ptid (int global_id)
-{
- struct thread_info *thread = find_thread_global_id (global_id);
-
- if (thread)
- return thread->ptid;
- else
- return minus_one_ptid;
-}
-
int
in_thread_list (ptid_t ptid)
{
- struct thread_info *tp;
-
- for (tp = thread_list; tp; tp = tp->next)
- if (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->global_num < ret->global_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;
-
- gdb_assert (pid != 0);
+ gdb_assert (inf->pid != 0);
/* Prefer the current thread. */
- if (ptid_get_pid (inferior_ptid) == pid)
+ if (inf == current_inferior ())
return inferior_thread ();
- ALL_NON_EXITED_THREADS (tp)
- if (ptid_get_pid (tp->ptid) == pid)
- return tp;
+ for (thread_info *tp : inf->non_exited_threads ())
+ return tp;
return NULL;
}
-struct thread_info *
-any_live_thread_of_process (int pid)
+thread_info *
+any_live_thread_of_inferior (inferior *inf)
{
struct thread_info *curr_tp = NULL;
- struct thread_info *tp;
struct thread_info *tp_executing = NULL;
- gdb_assert (pid != 0);
+ gdb_assert (inf != NULL && inf->pid != 0);
/* Prefer the current thread if it's not executing. */
- if (ptid_get_pid (inferior_ptid) == pid)
+ 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
return curr_tp;
}
- ALL_NON_EXITED_THREADS (tp)
- if (ptid_get_pid (tp->ptid) == pid)
- {
- if (!tp->executing)
- return tp;
+ for (thread_info *tp : inf->non_exited_threads ())
+ {
+ if (!tp->executing)
+ return tp;
- tp_executing = tp;
- }
+ tp_executing = tp;
+ }
/* If both the current thread and all live threads are executing,
prefer the current thread. */
void
prune_threads (void)
{
- struct thread_info *tp, *tmp;
-
- ALL_THREADS_SAFE (tp, tmp)
- {
- if (!thread_alive (tp))
- delete_thread (tp->ptid);
- }
+ for (thread_info *tp : all_threads_safe ())
+ if (!thread_alive (tp))
+ delete_thread (tp);
}
/* See gdbthreads.h. */
void
delete_exited_threads (void)
{
- struct thread_info *tp, *tmp;
-
- ALL_THREADS_SAFE (tp, tmp)
- {
- if (tp->state == THREAD_EXITED)
- delete_thread (tp->ptid);
- }
+ for (thread_info *tp : all_threads_safe ())
+ if (tp->state == THREAD_EXITED)
+ delete_thread (tp);
}
-/* Disable storing stack temporaries for the thread whose id is
- stored in DATA. */
-
-static void
-disable_thread_stack_temporaries (void *data)
-{
- ptid_t *pd = (ptid_t *) data;
- struct thread_info *tp = find_thread_ptid (*pd);
-
- if (tp != NULL)
- {
- tp->stack_temporaries_enabled = 0;
- VEC_free (value_ptr, tp->stack_temporaries);
- }
-
- xfree (pd);
-}
+/* Return true value if stack temporaries are enabled for the thread
+ TP. */
-/* Enable storing stack temporaries for thread with id PTID and return a
- cleanup which can disable and clear the stack temporaries. */
-
-struct cleanup *
-enable_thread_stack_temporaries (ptid_t ptid)
-{
- struct thread_info *tp = find_thread_ptid (ptid);
- ptid_t *data;
- struct cleanup *c;
-
- gdb_assert (tp != NULL);
-
- tp->stack_temporaries_enabled = 1;
- tp->stack_temporaries = NULL;
- data = XNEW (ptid_t);
- *data = ptid;
- c = make_cleanup (disable_thread_stack_temporaries, data);
-
- return c;
-}
-
-/* Return non-zero value if stack temporaies are enabled for the thread
- with id PTID. */
-
-int
-thread_stack_temporaries_enabled_p (ptid_t ptid)
+bool
+thread_stack_temporaries_enabled_p (thread_info *tp)
{
- struct thread_info *tp = find_thread_ptid (ptid);
-
if (tp == NULL)
- return 0;
+ 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 (ptid_t ptid, struct value *v)
+push_thread_stack_temporary (thread_info *tp, struct value *v)
{
- struct thread_info *tp = find_thread_ptid (ptid);
-
gdb_assert (tp != NULL && tp->stack_temporaries_enabled);
- VEC_safe_push (value_ptr, tp->stack_temporaries, v);
+ tp->stack_temporaries.push_back (v);
}
-/* Return 1 if VAL is among the stack temporaries of the thread
- with id PTID. Return 0 otherwise. */
+/* Return true if VAL is among the stack temporaries of the thread
+ TP. Return false otherwise. */
-int
-value_in_thread_stack_temporaries (struct value *val, ptid_t ptid)
+bool
+value_in_thread_stack_temporaries (struct value *val, thread_info *tp)
{
- struct thread_info *tp = find_thread_ptid (ptid);
-
gdb_assert (tp != NULL && tp->stack_temporaries_enabled);
- if (!VEC_empty (value_ptr, tp->stack_temporaries))
- {
- struct value *v;
- int i;
+ for (value *v : tp->stack_temporaries)
+ if (v == val)
+ return true;
- for (i = 0; VEC_iterate (value_ptr, tp->stack_temporaries, i, v); i++)
- if (v == val)
- return 1;
- }
-
- return 0;
+ 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. */
-struct value *
-get_last_thread_stack_temporary (ptid_t ptid)
+value *
+get_last_thread_stack_temporary (thread_info *tp)
{
struct value *lastval = NULL;
- struct thread_info *tp = find_thread_ptid (ptid);
gdb_assert (tp != NULL);
- if (!VEC_empty (value_ptr, tp->stack_temporaries))
- lastval = VEC_last (value_ptr, tp->stack_temporaries);
+ if (!tp->stack_temporaries.empty ())
+ lastval = tp->stack_temporaries.back ();
return lastval;
}
changes. E.g, target remote may only discover the remote process
pid after adding the inferior to GDB's list. */
inf = find_inferior_ptid (old_ptid);
- inf->pid = ptid_get_pid (new_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_resumed (ptid_t ptid, int resumed)
{
- struct thread_info *tp;
- int all = 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->resumed = resumed;
- }
- else
- {
- tp = find_thread_ptid (ptid);
- gdb_assert (tp != NULL);
- tp->resumed = resumed;
- }
+ for (thread_info *tp : all_non_exited_threads (ptid))
+ tp->resumed = resumed;
}
/* Helper for set_running, that marks one thread either running or
return started;
}
+/* See gdbthread.h. */
+
void
-set_running (ptid_t ptid, int running)
+thread_info::set_running (bool running)
{
- struct thread_info *tp;
- int all = ptid == minus_one_ptid;
- int any_started = 0;
-
- /* 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))
- {
- 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 (set_running_thread (tp, running))
- any_started = 1;
- }
- }
- else
- {
- tp = find_thread_ptid (ptid);
- gdb_assert (tp != NULL);
- gdb_assert (tp->state != THREAD_EXITED);
- if (set_running_thread (tp, running))
- any_started = 1;
- }
- if (any_started)
- observer_notify_target_resumed (ptid);
+ if (set_running_thread (this, running))
+ gdb::observers::target_resumed.notify (this->ptid);
}
-static int
-is_thread_state (ptid_t ptid, enum thread_state state)
+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;
- tp = find_thread_ptid (ptid);
- gdb_assert (tp);
- return tp->state == state;
-}
+ for (thread_info *tp : all_non_exited_threads (ptid))
+ if (set_running_thread (tp, running))
+ any_started = true;
-int
-is_stopped (ptid_t ptid)
-{
- return is_thread_state (ptid, THREAD_STOPPED);
+ if (any_started)
+ gdb::observers::target_resumed.notify (ptid);
}
-int
-is_exited (ptid_t ptid)
-{
- return is_thread_state (ptid, THREAD_EXITED);
-}
-int
-is_running (ptid_t ptid)
-{
- return is_thread_state (ptid, THREAD_RUNNING);
-}
+/* 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. */
-int
-is_executing (ptid_t ptid)
+static void
+set_executing_thread (thread_info *thr, bool executing)
{
- struct thread_info *tp;
-
- tp = find_thread_ptid (ptid);
- gdb_assert (tp);
- return tp->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 == minus_one_ptid;
+ for (thread_info *tp : all_non_exited_threads (ptid))
+ set_executing_thread (tp, executing);
- 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;
- }
-
- /* It only takes one running thread to spawn more threads.*/
+ /* 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
void
set_stop_requested (ptid_t ptid, int stop)
{
- struct thread_info *tp;
- int all = 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 == 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 (set_running_thread (tp, tp->executing))
- any_started = 1;
- }
- }
- }
- else
- {
- tp = find_thread_ptid (ptid);
- gdb_assert (tp);
- if (tp->state != THREAD_EXITED)
- {
- if (set_running_thread (tp, tp->executing))
- any_started = 1;
- }
- }
+ 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);
-}
-
-void
-finish_thread_state_cleanup (void *arg)
-{
- ptid_t *ptid_p = (ptid_t *) arg;
-
- gdb_assert (arg);
-
- finish_thread_state (*ptid_p);
+ gdb::observers::target_resumed.notify (ptid);
}
/* See gdbthread.h. */
if (inferior_ptid == null_ptid)
error (_("No thread selected."));
+ thread_info *tp = inferior_thread ();
+
/* Don't try to read from a dead thread. */
- if (is_exited (inferior_ptid))
+ if (tp->state == THREAD_EXITED)
error (_("The current thread has terminated"));
/* ... or from a spinning thread. FIXME: This isn't actually fully
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 (is_executing (inferior_ptid))
+ if (tp->executing)
error (_("Selected thread is running."));
}
/* See gdbthread.h. */
bool
-can_access_registers_ptid (ptid_t ptid)
+can_access_registers_thread (thread_info *thread)
{
/* No thread, no registers. */
- if (ptid == null_ptid)
+ if (thread == NULL)
return false;
/* Don't try to read from a dead thread. */
- if (is_exited (ptid))
+ if (thread->state == THREAD_EXITED)
return false;
/* ... or from a spinning thread. FIXME: see validate_registers_access. */
- if (is_executing (ptid))
+ if (thread->executing)
return false;
return true;
return 0;
}
- if (pid != -1 && ptid_get_pid (thr->ptid) != pid)
+ if (pid != -1 && thr->ptid.pid () != pid)
{
if (requested_threads != NULL && *requested_threads != '\0')
error (_("Requested thread not found in requested process"));
return 1;
}
+/* Return the string to display in "info threads"'s "Target Id"
+ column, for TP. */
+
+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;
+}
+
/* 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, char *requested_threads,
+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;
- const char *extra_info, *name, *target_id;
- struct inferior *inf;
int default_inf_num = current_inferior ()->num;
update_thread_list ();
- current_ptid = inferior_ptid;
+
+ /* Whether we saw any thread. */
+ bool any_thread = false;
+ /* Whether the current thread is exited. */
+ bool current_exited = false;
+
+ thread_info *current_thread = (inferior_ptid != null_ptid
+ ? inferior_thread () : NULL);
{
/* For backward compatibility, we make a list for MI. A table is
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;
- for (tp = thread_list; tp; tp = tp->next)
+ for (thread_info *tp : all_threads ())
{
if (!should_print_thread (requested_threads, default_inf_num,
global_ids, pid, tp))
continue;
+ if (!uiout->is_mi_like_p ())
+ {
+ target_id_col_width
+ = std::max (target_id_col_width,
+ thread_target_id_str (tp).size ());
+ }
+
++n_threads;
}
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 (17, ui_left, "target-id", "Target Id");
+ uiout->table_header (target_id_col_width, ui_left,
+ "target-id", "Target Id");
uiout->table_header (1, ui_left, "frame", "Frame");
uiout->table_body ();
}
/* We'll be switching threads temporarily. */
scoped_restore_current_thread restore_thread;
- ALL_THREADS_BY_INFERIOR (inf, tp)
+ for (inferior *inf : all_inferiors ())
{
- int core;
+ /* Print the threads in per-inferior number order. */
+ std::vector<thread_info *> threads_to_print;
- if (!should_print_thread (requested_threads, default_inf_num,
- global_ids, pid, tp))
- continue;
-
- ui_out_emit_tuple tuple_emitter (uiout, NULL);
+ for (thread_info *tp : inf->threads ())
+ threads_to_print.push_back (tp);
- if (!uiout->is_mi_like_p ())
+ std::sort (threads_to_print.begin (), threads_to_print.end (),
+ [] (thread_info *a, thread_info *b)
{
- if (tp->ptid == current_ptid)
- uiout->field_string ("current", "*");
- else
- uiout->field_skip ("current");
+ return a->per_inf_num < b->per_inf_num;
+ });
- uiout->field_string ("id-in-tg", print_thread_id (tp));
- }
-
- if (show_global_ids || uiout->is_mi_like_p ())
- uiout->field_int ("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. */
-
- target_id = target_pid_to_str (tp->ptid);
- extra_info = target_extra_thread_info (tp);
- name = tp->name ? tp->name : target_thread_name (tp);
-
- if (uiout->is_mi_like_p ())
- {
- uiout->field_string ("target-id", target_id);
- if (extra_info)
- uiout->field_string ("details", extra_info);
- if (name)
- uiout->field_string ("name", name);
- }
- else
+ for (thread_info *tp : threads_to_print)
{
- std::string contents;
-
- if (extra_info && name)
- contents = string_printf ("%s \"%s\" (%s)", target_id,
- name, extra_info);
- else if (extra_info)
- contents = string_printf ("%s (%s)", target_id, extra_info);
- else if (name)
- contents = string_printf ("%s \"%s\"", target_id, name);
- else
- contents = target_id;
+ int core;
- uiout->field_string ("target-id", contents.c_str ());
- }
+ any_thread = true;
+ if (tp == current_thread && tp->state == THREAD_EXITED)
+ current_exited = true;
- 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->ptid);
- print_stack_frame (get_selected_frame (NULL),
- /* For MI output, print frame level. */
- uiout->is_mi_like_p (),
- LOCATION, 0);
- }
+ if (!should_print_thread (requested_threads, default_inf_num,
+ global_ids, pid, tp))
+ continue;
- if (uiout->is_mi_like_p ())
- {
- const char *state = "stopped";
+ 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)
- state = "running";
- uiout->field_string ("state", state);
+ uiout->text ("(running)\n");
+ else
+ {
+ /* The switch below puts us at the top of the stack (leaf
+ frame). */
+ switch_to_thread (tp);
+ print_stack_frame (get_selected_frame (NULL),
+ /* For MI output, print frame level. */
+ uiout->is_mi_like_p (),
+ LOCATION, 0);
+ }
+
+ if (uiout->is_mi_like_p ())
+ {
+ const char *state = "stopped";
+
+ 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);
}
-
- core = target_core_of_thread (tp->ptid);
- if (uiout->is_mi_like_p () && core != -1)
- uiout->field_int ("core", core);
}
/* This end scope restores the current thread and the frame
if (pid == -1 && requested_threads == NULL)
{
- if (uiout->is_mi_like_p ()
- && inferior_ptid != null_ptid)
- {
- int num = ptid_to_global_thread_id (inferior_ptid);
+ if (uiout->is_mi_like_p () && inferior_ptid != null_ptid)
+ uiout->field_signed ("current-thread-id", current_thread->global_num);
- gdb_assert (num != 0);
- uiout->field_int ("current-thread-id", num);
- }
-
- if (inferior_ptid != null_ptid && is_exited (inferior_ptid))
+ 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 (thread_list != NULL && inferior_ptid == null_ptid)
+ 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, char *requested_threads, int pid)
+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<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
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)
+{
+ 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)
{
- int show_global_ids = 0;
+ 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;
- if (arg != NULL
- && check_for_argument (&arg, "-gid", sizeof ("-gid") - 1))
+ /* Convenience to let the user know what the option can accept. */
+ if (*text == '\0')
{
- arg = skip_spaces (arg);
- show_global_ids = 1;
+ gdb::option::complete_on_all_options (tracker, grp);
+ /* Keep this "ID" in sync with what "help info threads"
+ says. */
+ tracker.add_completion (make_unique_xstrdup ("ID"));
}
-
- print_thread_info_1 (current_uiout, arg, 0, -1, show_global_ids);
}
/* See gdbthread.h. */
set_current_inferior (inf);
inferior_ptid = thread->ptid;
- stop_pc = ~(CORE_ADDR) 0;
}
-/* Switch to no thread selected. */
+/* See gdbthread.h. */
-static void
+void
switch_to_no_thread ()
{
if (inferior_ptid == null_ptid)
inferior_ptid = null_ptid;
reinit_frame_cache ();
- stop_pc = ~(CORE_ADDR) 0;
}
-/* Switch from one thread to another. */
+/* See gdbthread.h. */
-static void
+void
switch_to_thread (thread_info *thr)
{
gdb_assert (thr != NULL);
switch_to_thread_no_regs (thr);
reinit_frame_cache ();
-
- /* 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 (thr->state != THREAD_EXITED
- && !thr->executing)
- stop_pc = regcache_read_pc (get_thread_regcache (thr->ptid));
}
-/* See gdbthread.h. */
+/* See gdbsupport/common-gdbthread.h. */
void
switch_to_thread (ptid_t ptid)
{
- if (ptid == null_ptid)
- switch_to_no_thread ();
- else
- switch_to_thread (find_thread_ptid (ptid));
+ thread_info *thr = find_thread_ptid (ptid);
+ switch_to_thread (thr);
}
static void
changed, so we have to recheck it here. */
if (inferior_ptid != null_ptid
&& m_was_stopped
- && is_stopped (inferior_ptid)
+ && m_thread->state == THREAD_STOPPED
&& target_has_registers
&& target_has_stack
&& target_has_memory)
if (inferior_ptid != null_ptid)
{
- thread_info *tp = find_thread_ptid (inferior_ptid);
+ thread_info *tp = inferior_thread ();
struct frame_info *frame;
- gdb_assert (tp != NULL);
-
m_was_stopped = tp->state == THREAD_STOPPED;
if (m_was_stopped
&& target_has_registers
return s;
}
-/* If true, tp_array_compar should sort in ascending order, otherwise
- in descending order. */
+/* 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;
+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;
-/* Sort an array for struct thread_info pointers by thread ID (first
- by inferior number, and then by per-inferior thread number). The
- order is determined by TP_ARRAY_COMPAR_ASCENDING. */
+ 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 (const thread_info *a, const thread_info *b)
+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. */
+
+static void
+thr_try_catch_cmd (thread_info *thr, const char *cmd, int from_tty,
+ const qcs_flags &flags)
+{
+ switch_to_thread (thr);
+ try
{
- if (tp_array_compar_ascending)
- return a->inf->num < b->inf->num;
- else
- return a->inf->num > b->inf->num;
+ 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;
+ }
+ }
+}
- if (tp_array_compar_ascending)
- return (a->per_inf_num < b->per_inf_num);
- else
- return (a->per_inf_num > b->per_inf_num);
+/* 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<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)
{
- tp_array_compar_ascending = false;
- if (cmd != NULL
- && check_for_argument (&cmd, "-ascending", strlen ("-ascending")))
- {
- cmd = skip_spaces (cmd);
- tp_array_compar_ascending = true;
- }
+ 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 ();
- /* Save a copy of the command in case it is clobbered by
- execute_command. */
- std::string saved_cmd = cmd;
-
int tc = live_threads_count ();
if (tc != 0)
{
std::vector<thread_info *> thr_list_cpy;
thr_list_cpy.reserve (tc);
- {
- thread_info *tp;
-
- ALL_NON_EXITED_THREADS (tp)
- {
- thr_list_cpy.push_back (tp);
- }
-
- gdb_assert (thr_list_cpy.size () == 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);
- std::sort (thr_list_cpy.begin (), thr_list_cpy.end (), tp_array_compar);
+ 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))
- {
- switch_to_thread (thr->ptid);
- printf_filtered (_("\nThread %s (%s):\n"),
- print_thread_id (thr),
- target_pid_to_str (inferior_ptid));
- execute_command (cmd, from_tty);
+ thr_try_catch_cmd (thr, cmd, from_tty, flags);
+ }
+}
- /* Restore exact command used previously. */
- strcpy (cmd, saved_cmd.c_str ());
- }
+/* Completer for "thread apply [ID list]". */
+
+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;
+
+ 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 (const char *tidlist, int from_tty)
{
- char *cmd = NULL;
+ qcs_flags flags;
+ const char *cmd = NULL;
tid_range_parser parser;
if (tidlist == NULL || *tidlist == '\000')
int inf_num, thr_start, thr_end;
if (!parser.get_tid_range (&inf_num, &thr_start, &thr_end))
- {
- cmd = (char *) parser.cur_tok ();
- break;
- }
+ break;
}
- if (cmd == NULL)
+ 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);
+
+ validate_flags_qcs ("thread apply", &flags);
+
+ if (*cmd == '\0')
error (_("Please specify a command following the thread ID list"));
- if (tidlist == cmd || !isalpha (cmd[0]))
+ if (tidlist == cmd || isdigit (cmd[0]))
invalid_thread_id_error (cmd);
- /* Save a copy of the command in case it is clobbered by
- execute_command. */
- std::string saved_cmd = cmd;
-
scoped_restore_current_thread restore_thread;
parser.init (tidlist, current_inferior ()->num);
- while (!parser.finished () && parser.cur_tok () < cmd)
+ while (!parser.finished ())
{
struct thread_info *tp = NULL;
struct inferior *inf;
continue;
}
- switch_to_thread (tp->ptid);
+ thr_try_catch_cmd (tp, cmd, from_tty, flags);
+ }
+}
- printf_filtered (_("\nThread %s (%s):\n"), print_thread_id (tp),
- target_pid_to_str (inferior_ptid));
- execute_command (cmd, from_tty);
- /* Restore exact command used previously. */
- strcpy (cmd, saved_cmd.c_str ());
- }
+/* 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
+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)
{
struct thread_info *tp = inferior_thread ();
- if (is_exited (inferior_ptid))
+ if (tp->state == THREAD_EXITED)
printf_filtered (_("[Current thread is %s (%s) (exited)]\n"),
print_thread_id (tp),
- target_pid_to_str (inferior_ptid));
+ target_pid_to_str (inferior_ptid).c_str ());
else
printf_filtered (_("[Current thread is %s (%s)]\n"),
print_thread_id (tp),
- target_pid_to_str (inferior_ptid));
+ target_pid_to_str (inferior_ptid).c_str ());
}
else
error (_("No stack."));
}
else
{
- observer_notify_user_selected_context_changed (USER_SELECTED_THREAD
- | USER_SELECTED_FRAME);
+ gdb::observers::user_selected_context_changed.notify
+ (USER_SELECTED_THREAD | USER_SELECTED_FRAME);
}
}
}
static void
thread_find_command (const char *arg, int from_tty)
{
- struct thread_info *tp;
const char *tmp;
unsigned long match = 0;
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))
{
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 %s has target id '%s'\n"),
- print_thread_id (tp), tmp);
+ print_thread_id (tp), name.c_str ());
match++;
}
}
/* Print notices when new threads are attached and detached. */
-int print_thread_events = 1;
+bool print_thread_events = true;
static void
show_print_thread_events (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
if (!thread_alive (tp))
error (_("Thread ID %s has terminated."), tidstr);
- switch_to_thread (tp->ptid);
+ switch_to_thread (tp);
annotate_thread_changed ();
user_selected_what selection)
{
struct thread_info *tp = inferior_thread ();
- struct inferior *inf = current_inferior ();
if (selection & USER_SELECTED_THREAD)
{
if (uiout->is_mi_like_p ())
{
- uiout->field_int ("new-thread-id",
- inferior_thread ()->global_num);
+ uiout->field_signed ("new-thread-id",
+ inferior_thread ()->global_num);
}
else
{
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));
+ uiout->text (target_pid_to_str (inferior_ptid).c_str ());
uiout->text (")]");
}
}
static void
update_threads_executing (void)
{
- struct thread_info *tp;
-
threads_executing = 0;
- ALL_NON_EXITED_THREADS (tp)
+ for (thread_info *tp : all_non_exited_threads ())
{
if (tp->executing)
{
static struct value *
thread_num_make_value_helper (struct gdbarch *gdbarch, int global)
{
- struct thread_info *tp = find_thread_ptid (inferior_ptid);
int int_val;
- if (tp == NULL)
+ if (inferior_ptid == null_ptid)
int_val = 0;
- else if (global)
- int_val = tp->global_num;
else
- int_val = tp->per_inf_num;
+ {
+ 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);
}
_initialize_thread (void)
{
static struct cmd_list_element *thread_apply_list = NULL;
+ cmd_list_element *c;
- add_info ("threads", info_threads_command,
- _("Display currently known threads.\n\
-Usage: info threads [-gid] [ID]...\n\
--gid: Show global thread IDs.\n\
+ const auto info_threads_opts = make_info_threads_options_def_group (nullptr);
+
+ /* Note: keep this "ID" in sync with what "info threads [TAB]"
+ suggests. */
+ static std::string info_threads_help
+ = gdb::option::build_help (_("\
+Display currently known threads.\n\
+Usage: info threads [OPTION]... [ID]...\n\
+\n\
+Options:\n\
+%OPTIONS%\
If ID is given, it is a space-separated list of IDs of threads to display.\n\
-Otherwise, all threads are displayed."));
+Otherwise, all threads are displayed."),
+ info_threads_opts);
+
+ c = add_info ("threads", info_threads_command, info_threads_help.c_str ());
+ set_cmd_completer_handle_brkchars (c, info_threads_command_completer);
add_prefix_cmd ("thread", class_run, thread_command, _("\
Use this command to switch between threads.\n\
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);
+#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);
- add_cmd ("all", class_run, thread_apply_all_command,
- _("\
+ static std::string thread_apply_all_help = gdb::option::build_help (_("\
Apply a command to all threads.\n\
\n\
-Usage: thread apply all [-ascending] <command>\n\
--ascending: Call <command> for all threads in ascending order.\n\
- The default is descending order.\
-"),
- &thread_apply_list);
+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\
projects / deliverable / binutils-gdb.git / blobdiff