#include "observer.h"
#include "annotate.h"
#include "cli/cli-decode.h"
+#include "gdb_regex.h"
+#include "cli/cli-utils.h"
+#include "continuations.h"
/* Definition of struct thread_info exported to gdbthread.h. */
bpstat_clear (&tp->control.stop_bpstat);
- discard_all_intermediate_continuations_thread (tp);
- discard_all_continuations_thread (tp);
+ do_all_intermediate_continuations_thread (tp, 1);
+ do_all_continuations_thread (tp, 1);
delete_longjmp_breakpoint (tp->num);
}
static void
free_thread (struct thread_info *tp)
{
- clear_thread_inferior_resources (tp);
-
if (tp->private)
{
if (tp->private_dtor)
return;
}
+ /* Notify thread exit, but only if we haven't already. */
+ if (tp->state_ != THREAD_EXITED)
+ observer_notify_thread_exit (tp, silent);
+
+ /* Tag it as exited. */
+ tp->state_ = THREAD_EXITED;
+ clear_thread_inferior_resources (tp);
+
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);
-
free_thread (tp);
}
any_live_thread_of_process (int pid)
{
struct thread_info *tp;
- struct thread_info *tp_running = NULL;
+ struct thread_info *tp_executing = NULL;
for (tp = thread_list; tp; tp = tp->next)
- if (ptid_get_pid (tp->ptid) == pid)
+ if (tp->state_ != THREAD_EXITED && ptid_get_pid (tp->ptid) == pid)
{
- if (tp->state_ == THREAD_STOPPED)
+ if (tp->executing_)
+ tp_executing = tp;
+ else
return tp;
- else if (tp->state_ == THREAD_RUNNING)
- tp_running = tp;
}
- return tp_running;
+ return tp_executing;
}
/* Print a list of thread ids currently known, and the total number of
}
/* Prints the list of threads and their details on UIOUT.
- This is a version of 'info_thread_command' suitable for
+ This is a version of 'info_threads_command' suitable for
use from MI.
If REQUESTED_THREAD is not -1, it's the GDB id of the thread
that should be printed. Otherwise, all threads are
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)
+print_thread_info (struct ui_out *uiout, char *requested_threads, int pid)
{
struct thread_info *tp;
ptid_t current_ptid;
for (tp = thread_list; tp; tp = tp->next)
{
- if (requested_thread != -1 && tp->num != requested_thread)
+ if (!number_is_in_list (requested_threads, tp->num))
continue;
if (pid != -1 && PIDGET (tp->ptid) != pid)
if (n_threads == 0)
{
- if (requested_thread == -1)
+ if (requested_threads == NULL || *requested_threads == '\0')
ui_out_message (uiout, 0, _("No threads.\n"));
else
- ui_out_message (uiout, 0, _("No thread %d.\n"), requested_thread);
+ ui_out_message (uiout, 0, _("No threads match '%s'.\n"),
+ requested_threads);
do_cleanups (old_chain);
return;
}
struct cleanup *chain2;
int core;
- if (requested_thread != -1 && tp->num != requested_thread)
+ if (!number_is_in_list (requested_threads, tp->num))
continue;
if (pid != -1 && PIDGET (tp->ptid) != pid)
{
- if (requested_thread != -1)
+ if (requested_threads != NULL && *requested_threads != '\0')
error (_("Requested thread not found in requested process"));
continue;
}
the "info threads" command. */
do_cleanups (old_chain);
- if (pid == -1 && requested_thread == -1)
+ if (pid == -1 && requested_threads == NULL)
{
gdb_assert (current_thread != -1
|| !thread_list
}
}
-
/* Print information about currently known threads
- * 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.
- */
+ Optional ARG is a thread id, or list of thread ids.
+
+ 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)
{
- print_thread_info (uiout, -1, -1);
+ print_thread_info (uiout, arg, -1);
}
/* Switch from one thread to another. */
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
&& 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;
thread_apply_command (char *tidlist, int from_tty)
{
char *cmd;
- char *p;
struct cleanup *old_chain;
char *saved_cmd;
+ struct get_number_or_range_state state;
if (tidlist == NULL || *tidlist == '\000')
error (_("Please specify a thread ID list"));
execute_command. */
saved_cmd = xstrdup (cmd);
old_chain = make_cleanup (xfree, saved_cmd);
- while (tidlist < cmd)
+
+ init_number_or_range (&state, tidlist);
+ while (!state.finished && state.string < cmd)
{
struct thread_info *tp;
- int start, end;
+ int start;
+ char *p = tidlist;
- start = strtol (tidlist, &p, 10);
- if (p == tidlist)
- error (_("Error parsing %s"), tidlist);
- tidlist = p;
-
- while (*tidlist == ' ' || *tidlist == '\t')
- tidlist++;
-
- if (*tidlist == '-') /* Got a range of IDs? */
- {
- 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;
+ start = get_number_or_range (&state);
make_cleanup_restore_current_thread ();
- for (; start <= end; start++)
- {
- tp = find_thread_id (start);
+ tp = find_thread_id (start);
- if (!tp)
- warning (_("Unknown thread %d."), start);
- else if (!thread_alive (tp))
- warning (_("Thread %d has terminated."), start);
- else
- {
- switch_to_thread (tp->ptid);
+ if (!tp)
+ warning (_("Unknown thread %d."), start);
+ else if (!thread_alive (tp))
+ warning (_("Thread %d has terminated."), start);
+ 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);
+ printf_filtered (_("\nThread %d (%s):\n"), tp->num,
+ target_pid_to_str (inferior_ptid));
+ execute_command (cmd, from_tty);
- /* Restore exact command used previously. */
- strcpy (cmd, saved_cmd);
- }
+ /* Restore exact command used previously. */
+ strcpy (cmd, saved_cmd);
}
}
info->name = arg ? xstrdup (arg) : NULL;
}
+/* Find thread ids with a name, target pid, or extra info matching ARG. */
+
+static void
+thread_find_command (char *arg, int from_tty)
+{
+ struct thread_info *tp;
+ char *tmp;
+ unsigned long match = 0;
+
+ if (arg == NULL || *arg == '\0')
+ error (_("Command requires an argument."));
+
+ tmp = re_comp (arg);
+ if (tmp != 0)
+ error (_("Invalid regexp (%s): %s"), tmp, arg);
+
+ update_thread_list ();
+ for (tp = thread_list; tp; tp = tp->next)
+ {
+ if (tp->name != NULL && re_exec (tp->name))
+ {
+ printf_filtered (_("Thread %d has name '%s'\n"),
+ tp->num, tp->name);
+ match++;
+ }
+
+ tmp = target_thread_name (tp);
+ if (tmp != NULL && re_exec (tmp))
+ {
+ printf_filtered (_("Thread %d has target name '%s'\n"),
+ tp->num, tmp);
+ match++;
+ }
+
+ tmp = target_pid_to_str (tp->ptid);
+ if (tmp != NULL && re_exec (tmp))
+ {
+ printf_filtered (_("Thread %d has target id '%s'\n"),
+ tp->num, tmp);
+ match++;
+ }
+
+ tmp = target_extra_thread_info (tp);
+ if (tmp != NULL && re_exec (tmp))
+ {
+ printf_filtered (_("Thread %d has extra info '%s'\n"),
+ tp->num, tmp);
+ match++;
+ }
+ }
+ if (!match)
+ printf_filtered (_("No threads match '%s'\n"), arg);
+}
+
/* Print notices when new threads are attached and detached. */
int print_thread_events = 1;
static void
{
static struct cmd_list_element *thread_apply_list = NULL;
- add_info ("threads", info_threads_command,
- _("IDs of currently known threads."));
+ add_info ("threads", info_threads_command,
+ _("Display currently known threads.\n\
+Usage: info threads [ID]...\n\
+Optional arguments are thread IDs with spaces between.\n\
+If no arguments, all threads are displayed."));
add_prefix_cmd ("thread", class_run, thread_command, _("\
Use this command to switch between threads.\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);
+
if (!xdb_commands)
add_com_alias ("t", "thread", class_run, 1);
projects / deliverable / binutils-gdb.git / blobdiff