/* 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-1988, 1993-2004, 2007-2012 Free Software
+ Foundation, Inc.
Contributed by Lynx Real-Time Systems, Inc. Los Gatos, CA.
#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. */
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,
-};
-
struct thread_info*
inferior_thread (void)
{
tp->control.exception_resume_breakpoint = NULL;
}
- bpstat_clear (&tp->control.stop_bpstat);
+ delete_longjmp_breakpoint_at_next_stop (tp->num);
- discard_all_intermediate_continuations_thread (tp);
- discard_all_continuations_thread (tp);
+ bpstat_clear (&tp->control.stop_bpstat);
- delete_longjmp_breakpoint (tp->num);
+ do_all_intermediate_continuations_thread (tp, 1);
+ do_all_continuations_thread (tp, 1);
}
static void
free_thread (struct thread_info *tp)
{
- clear_thread_inferior_resources (tp);
-
if (tp->private)
{
if (tp->private_dtor)
/* Nothing to follow yet. */
tp->pending_follow.kind = TARGET_WAITKIND_SPURIOUS;
- tp->state_ = THREAD_STOPPED;
+ tp->state = THREAD_STOPPED;
return tp;
}
tp = new_thread (null_ptid);
/* Make switch_to_thread not read from the thread. */
- tp->state_ = THREAD_EXITED;
+ tp->state = THREAD_EXITED;
switch_to_thread (null_ptid);
/* Now we can delete it. */
/* Now reset its ptid, and reswitch inferior_ptid to it. */
tp->ptid = ptid;
- tp->state_ = THREAD_STOPPED;
+ tp->state = THREAD_STOPPED;
switch_to_thread (ptid);
observer_notify_new_thread (tp);
if (tp->refcount > 0
|| ptid_equal (tp->ptid, inferior_ptid))
{
- if (tp->state_ != THREAD_EXITED)
+ if (tp->state != THREAD_EXITED)
{
observer_notify_thread_exit (tp, silent);
/* Tag it as exited. */
- tp->state_ = THREAD_EXITED;
+ tp->state = THREAD_EXITED;
/* Clear breakpoints, etc. associated with this thread. */
clear_thread_inferior_resources (tp);
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
for (tp = thread_list; tp; tp = tp->next)
{
- if (tp->state_ == THREAD_EXITED)
+ if (tp->state == THREAD_EXITED)
continue;
if (ptid_equal (tp->ptid, inferior_ptid))
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;
for (tp = thread_list; tp; tp = tp->next)
if (all || ptid_get_pid (tp->ptid) == ptid_get_pid (ptid))
{
- if (tp->state_ == THREAD_EXITED)
+ if (tp->state == THREAD_EXITED)
continue;
- if (running && tp->state_ == THREAD_STOPPED)
+ if (running && tp->state == THREAD_STOPPED)
any_started = 1;
- tp->state_ = running ? THREAD_RUNNING : THREAD_STOPPED;
+ tp->state = running ? THREAD_RUNNING : THREAD_STOPPED;
}
if (any_started)
observer_notify_target_resumed (ptid);
tp = find_thread_ptid (ptid);
gdb_assert (tp);
- gdb_assert (tp->state_ != THREAD_EXITED);
- if (running && tp->state_ == THREAD_STOPPED)
+ gdb_assert (tp->state != THREAD_EXITED);
+ if (running && tp->state == THREAD_STOPPED)
started = 1;
- tp->state_ = running ? THREAD_RUNNING : THREAD_STOPPED;
+ tp->state = running ? THREAD_RUNNING : THREAD_STOPPED;
if (started)
observer_notify_target_resumed (ptid);
}
tp = find_thread_ptid (ptid);
gdb_assert (tp);
- return tp->state_ == state;
+ return tp->state == state;
}
int
struct thread_info *tp;
for (tp = thread_list; tp; tp = tp->next)
- if (tp->state_ == THREAD_RUNNING)
+ if (tp->state == THREAD_RUNNING)
return 1;
return 0;
tp = find_thread_ptid (ptid);
gdb_assert (tp);
- return tp->executing_;
+ return tp->executing;
}
void
{
for (tp = thread_list; tp; tp = tp->next)
if (all || ptid_get_pid (tp->ptid) == ptid_get_pid (ptid))
- tp->executing_ = executing;
+ tp->executing = executing;
}
else
{
tp = find_thread_ptid (ptid);
gdb_assert (tp);
- tp->executing_ = executing;
+ tp->executing = executing;
}
}
{
for (tp = thread_list; tp; tp = tp->next)
{
- if (tp->state_ == THREAD_EXITED)
+ if (tp->state == THREAD_EXITED)
continue;
if (all || ptid_get_pid (ptid) == ptid_get_pid (tp->ptid))
{
- if (tp->executing_ && tp->state_ == THREAD_STOPPED)
+ if (tp->executing && tp->state == THREAD_STOPPED)
any_started = 1;
- tp->state_ = tp->executing_ ? THREAD_RUNNING : THREAD_STOPPED;
+ tp->state = tp->executing ? THREAD_RUNNING : THREAD_STOPPED;
}
}
}
{
tp = find_thread_ptid (ptid);
gdb_assert (tp);
- if (tp->state_ != THREAD_EXITED)
+ if (tp->state != THREAD_EXITED)
{
- if (tp->executing_ && tp->state_ == THREAD_STOPPED)
+ if (tp->executing && tp->state == THREAD_STOPPED)
any_started = 1;
- tp->state_ = tp->executing_ ? THREAD_RUNNING : THREAD_STOPPED;
+ tp->state = tp->executing ? THREAD_RUNNING : THREAD_STOPPED;
}
}
}
/* 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)
continue;
- if (tp->state_ == THREAD_EXITED)
+ if (tp->state == THREAD_EXITED)
continue;
++n_threads;
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;
}
if (ptid_equal (tp->ptid, current_ptid))
current_thread = tp->num;
- if (tp->state_ == THREAD_EXITED)
+ if (tp->state == THREAD_EXITED)
continue;
chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
do_cleanups (str_cleanup);
}
- if (tp->state_ == THREAD_RUNNING)
+ if (tp->state == THREAD_RUNNING)
ui_out_text (uiout, "(running)\n");
else
{
{
char *state = "stopped";
- if (tp->state_ == THREAD_RUNNING)
+ if (tp->state == THREAD_RUNNING)
state = "running";
ui_out_field_string (uiout, "state", state);
}
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
static void
info_threads_command (char *arg, int from_tty)
{
- int tid = -1;
-
- if (arg == NULL || *arg == '\0')
- {
- print_thread_info (uiout, -1, -1);
- return;
- }
-
- while (arg != NULL && *arg != '\0')
- {
- tid = get_number_or_range (&arg);
-
- if (tid <= 0)
- error (_("invalid thread id %d"), tid);
-
- print_thread_info (uiout, tid, -1);
- }
+ print_thread_info (current_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
select_frame (get_current_frame ());
/* Warn the user. */
- if (frame_level > 0 && !ui_out_is_mi_like_p (uiout))
+ if (frame_level > 0 && !ui_out_is_mi_like_p (current_uiout))
{
warning (_("Couldn't restore frame #%d in "
"current thread, at reparsed frame #0\n"),
int selected_frame_level;
int was_stopped;
int inf_id;
+ int was_removable;
};
static void
{
struct current_thread_cleanup *old = arg;
struct thread_info *tp;
+ struct inferior *inf;
tp = find_thread_ptid (old->inferior_ptid);
if (tp)
tp->refcount--;
+ inf = find_inferior_id (old->inf_id);
+ if (inf != NULL)
+ inf->removable = old->was_removable;
xfree (old);
}
old = xmalloc (sizeof (struct current_thread_cleanup));
old->inferior_ptid = inferior_ptid;
old->inf_id = current_inferior ()->num;
+ old->was_removable = current_inferior ()->removable;
if (!ptid_equal (inferior_ptid, null_ptid))
{
&& 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;
tp->refcount++;
}
+ current_inferior ()->removable = 0;
+
return make_cleanup_dtor (do_restore_current_thread_cleanup, old,
restore_current_thread_cleanup_dtor);
}
char *cmd;
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;
char *p = tidlist;
- start = get_number_or_range (&tidlist);
+ start = get_number_or_range (&state);
make_cleanup_restore_current_thread ();
return;
}
- gdb_thread_select (uiout, tidstr, NULL);
+ gdb_thread_select (current_uiout, tidstr, NULL);
}
/* Implementation of `thread name'. */
/* Note that we can't reach this with an exited thread, due to the
thread_alive check above. */
- if (tp->state_ == THREAD_RUNNING)
+ if (tp->state == THREAD_RUNNING)
ui_out_text (uiout, "(running)\n");
else
{
projects / deliverable / binutils-gdb.git / blobdiff