X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fthread.c;h=3cf1b940ad9629cb2b1ec23b77297ddd75f0af5c;hb=6a2c1b8790e58ce0688507b5b1f8369aa621a665;hp=8cca83d0ac4ac3bce7c93a36c85d96f9108fc69e;hpb=305962315a5d52b2289bac2623e04abbda158597;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/thread.c b/gdb/thread.c index 8cca83d0ac..3cf1b940ad 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -1,8 +1,6 @@ /* Multi-process/thread control for GDB, the GNU debugger. - Copyright (C) 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 1986-2017 Free Software Foundation, Inc. Contributed by Lynx Real-Time Systems, Inc. Los Gatos, CA. @@ -29,12 +27,11 @@ #include "value.h" #include "target.h" #include "gdbthread.h" -#include "exceptions.h" #include "command.h" #include "gdbcmd.h" #include "regcache.h" #include "gdb.h" -#include "gdb_string.h" +#include "btrace.h" #include #include @@ -45,7 +42,9 @@ #include "cli/cli-decode.h" #include "gdb_regex.h" #include "cli/cli-utils.h" -#include "continuations.h" +#include "thread-fsm.h" +#include "tid-parse.h" +#include /* Definition of struct thread_info exported to gdbthread.h. */ @@ -55,16 +54,44 @@ void _initialize_thread (void); /* Prototypes for local functions. */ -static struct thread_info *thread_list = NULL; +struct thread_info *thread_list = NULL; static int highest_thread_num; -static void thread_command (char *tidstr, int from_tty); +/* 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 void thread_apply_all_command (char *, int); static int thread_alive (struct thread_info *); static void info_threads_command (char *, int); static void thread_apply_command (char *, int); -static void restore_current_thread (ptid_t); -static void prune_threads (void); + +/* RAII type used to increase / decrease the refcount of each thread + in a given list of threads. */ + +class scoped_inc_dec_ref +{ +public: + explicit scoped_inc_dec_ref (const std::vector &thrds) + : m_thrds (thrds) + { + for (thread_info *thr : m_thrds) + thr->incref (); + } + + ~scoped_inc_dec_ref () + { + for (thread_info *thr : m_thrds) + thr->decref (); + } + +private: + const std::vector &m_thrds; +}; + struct thread_info* inferior_thread (void) @@ -74,23 +101,85 @@ 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, + struct 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; + thread_fsm_clean_up (thr->thread_fsm, thr); + thread_fsm_delete (thr->thread_fsm); + thr->thread_fsm = NULL; } } @@ -101,40 +190,38 @@ clear_thread_inferior_resources (struct thread_info *tp) but not any user-specified thread-specific breakpoints. We can not delete the breakpoint straight-off, because the inferior might not be stopped at the moment. */ - if (tp->control.step_resume_breakpoint) - { - tp->control.step_resume_breakpoint->disposition = disp_del_at_next_stop; - tp->control.step_resume_breakpoint = NULL; - } + delete_at_next_stop (&tp->control.step_resume_breakpoint); + delete_at_next_stop (&tp->control.exception_resume_breakpoint); + delete_at_next_stop (&tp->control.single_step_breakpoints); - if (tp->control.exception_resume_breakpoint) - { - tp->control.exception_resume_breakpoint->disposition - = disp_del_at_next_stop; - tp->control.exception_resume_breakpoint = NULL; - } + delete_longjmp_breakpoint_at_next_stop (tp->global_num); bpstat_clear (&tp->control.stop_bpstat); - do_all_intermediate_continuations_thread (tp, 1); - do_all_continuations_thread (tp, 1); + btrace_teardown (tp); - delete_longjmp_breakpoint (tp->num); + thread_cancel_execution_command (tp); } +/* Set the TP's state as exited. */ + static void -free_thread (struct thread_info *tp) +set_thread_exited (thread_info *tp, int silent) { - if (tp->private) + /* 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->state != THREAD_EXITED) { - if (tp->private_dtor) - tp->private_dtor (tp->private); - else - xfree (tp->private); - } + observer_notify_thread_exit (tp, silent); - xfree (tp->name); - xfree (tp); + /* Tag it as exited. */ + tp->state = THREAD_EXITED; + + /* Clear breakpoints, etc. associated with this thread. */ + clear_thread_inferior_resources (tp); + } } void @@ -150,30 +237,34 @@ init_thread_list (void) for (tp = thread_list; tp; tp = tpnext) { tpnext = tp->next; - free_thread (tp); + if (tp->deletable ()) + delete tp; + else + set_thread_exited (tp, 1); } thread_list = NULL; + threads_executing = 0; } -/* 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)); - - tp->ptid = ptid; - tp->num = ++highest_thread_num; - tp->next = thread_list; - thread_list = tp; + if (thread_list == NULL) + thread_list = tp; + else + { + struct thread_info *last; - /* Nothing to follow yet. */ - tp->pending_follow.kind = TARGET_WAITKIND_SPURIOUS; - tp->state = THREAD_STOPPED; + for (last = thread_list; last->next != NULL; last = last->next) + ; + last->next = tp; + } return tp; } @@ -182,6 +273,8 @@ 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); if (tp) @@ -197,9 +290,9 @@ add_thread_silent (ptid_t ptid) to it, delete the original thread, reset the new thread's ptid, and switch to it. */ - if (ptid_equal (inferior_ptid, ptid)) + if (inferior_ptid == ptid) { - tp = new_thread (null_ptid); + tp = new_thread (inf, null_ptid); /* Make switch_to_thread not read from the thread. */ tp->state = THREAD_EXITED; @@ -223,18 +316,18 @@ add_thread_silent (ptid_t ptid) delete_thread (ptid); } - tp = new_thread (ptid); + tp = new_thread (inf, ptid); observer_notify_new_thread (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, struct private_thread_info *priv) { struct thread_info *result = add_thread_silent (ptid); - result->private = private; + result->priv = priv; if (print_thread_events) printf_unfiltered (_("[New %s]\n"), target_pid_to_str (ptid)); @@ -249,6 +342,113 @@ add_thread (ptid_t ptid) return add_thread_with_info (ptid, NULL); } +thread_info::thread_info (struct inferior *inf_, ptid_t ptid_) + : ptid (ptid_), inf (inf_) +{ + gdb_assert (inf_ != NULL); + + this->global_num = ++highest_thread_num; + this->per_inf_num = ++inf_->highest_thread_num; + + /* 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; +} + +thread_info::~thread_info () +{ + if (this->priv) + { + if (this->private_dtor) + this->private_dtor (this->priv); + else + xfree (this->priv); + } + + xfree (this->name); +} + +/* 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) + { + *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; + } +} + +/* Remove TP from step-over chain LIST_P. */ + +static void +step_over_chain_remove (struct thread_info **list_p, struct thread_info *tp) +{ + gdb_assert (tp->step_over_next != NULL); + gdb_assert (tp->step_over_prev != NULL); + + if (*list_p == tp) + { + if (tp == tp->step_over_next) + *list_p = NULL; + else + *list_p = tp->step_over_next; + } + + tp->step_over_prev->step_over_next = tp->step_over_next; + tp->step_over_next->step_over_prev = tp->step_over_prev; + tp->step_over_prev = tp->step_over_next = NULL; +} + +/* See gdbthread.h. */ + +struct thread_info * +thread_step_over_chain_next (struct thread_info *tp) +{ + struct thread_info *next = tp->step_over_next; + + return (next == step_over_queue_head ? NULL : next); +} + +/* See gdbthread.h. */ + +int +thread_is_in_step_over_chain (struct thread_info *tp) +{ + return (tp->step_over_next != NULL); +} + +/* See gdbthread.h. */ + +void +thread_step_over_chain_enqueue (struct thread_info *tp) +{ + step_over_chain_enqueue (&step_over_queue_head, tp); +} + +/* See gdbthread.h. */ + +void +thread_step_over_chain_remove (struct thread_info *tp) +{ + step_over_chain_remove (&step_over_queue_head, tp); +} + /* Delete thread PTID. If SILENT, don't notify the observer of this exit. */ static void @@ -259,47 +459,26 @@ delete_thread_1 (ptid_t ptid, int silent) tpprev = NULL; for (tp = thread_list; tp; tpprev = tp, tp = tp->next) - if (ptid_equal (tp->ptid, ptid)) + if (tp->ptid == ptid) break; if (!tp) return; - /* 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)) - { - if (tp->state != THREAD_EXITED) - { - observer_notify_thread_exit (tp, silent); - - /* Tag it as exited. */ - tp->state = THREAD_EXITED; - - /* Clear breakpoints, etc. associated with this thread. */ - clear_thread_inferior_resources (tp); - } + set_thread_exited (tp, silent); + if (!tp->deletable ()) + { /* Will be really deleted some other time. */ 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; - free_thread (tp); + delete tp; } /* Delete thread PTID and notify of thread exit. If this is @@ -319,12 +498,24 @@ delete_thread_silent (ptid_t ptid) } struct thread_info * -find_thread_id (int num) +find_thread_global_id (int global_id) +{ + struct thread_info *tp; + + for (tp = thread_list; tp; tp = tp->next) + if (tp->global_num == global_id) + return tp; + + return NULL; +} + +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->num == num) + if (tp->inf == inf && tp->per_inf_num == thr_num) return tp; return NULL; @@ -337,7 +528,7 @@ find_thread_ptid (ptid_t ptid) struct thread_info *tp; for (tp = thread_list; tp; tp = tp->next) - if (ptid_equal (tp->ptid, ptid)) + if (tp->ptid == ptid) return tp; return NULL; @@ -349,11 +540,11 @@ find_thread_ptid (ptid_t ptid) * 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. */ @@ -382,42 +573,56 @@ thread_count (void) for (tp = thread_list; tp; tp = tp->next) ++result; - return result; + return result; +} + +/* 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; } int -valid_thread_id (int num) +valid_global_thread_id (int global_id) { struct thread_info *tp; for (tp = thread_list; tp; tp = tp->next) - if (tp->num == num) + if (tp->global_num == global_id) return 1; return 0; } int -pid_to_thread_id (ptid_t ptid) +ptid_to_global_thread_id (ptid_t ptid) { struct thread_info *tp; for (tp = thread_list; tp; tp = tp->next) - if (ptid_equal (tp->ptid, ptid)) - return tp->num; + if (tp->ptid == ptid) + return tp->global_num; return 0; } ptid_t -thread_id_to_pid (int num) +global_thread_id_to_ptid (int global_id) { - struct thread_info *thread = find_thread_id (num); + struct thread_info *thread = find_thread_global_id (global_id); if (thread) return thread->ptid; else - return pid_to_ptid (-1); + return minus_one_ptid; } int @@ -426,7 +631,7 @@ in_thread_list (ptid_t ptid) struct thread_info *tp; for (tp = thread_list; tp; tp = tp->next) - if (ptid_equal (tp->ptid, ptid)) + if (tp->ptid == ptid) return 1; return 0; /* Never heard of 'im. */ @@ -442,7 +647,7 @@ first_thread_of_process (int pid) for (tp = thread_list; tp; tp = tp->next) if (pid == -1 || ptid_get_pid (tp->ptid) == pid) - if (ret == NULL || tp->num < ret->num) + if (ret == NULL || tp->global_num < ret->global_num) ret = tp; return ret; @@ -453,7 +658,13 @@ any_thread_of_process (int pid) { struct thread_info *tp; - for (tp = thread_list; tp; tp = tp->next) + gdb_assert (pid != 0); + + /* Prefer the current thread. */ + if (ptid_get_pid (inferior_ptid) == pid) + return inferior_thread (); + + ALL_NON_EXITED_THREADS (tp) if (ptid_get_pid (tp->ptid) == pid) return tp; @@ -463,18 +674,40 @@ any_thread_of_process (int pid) struct thread_info * any_live_thread_of_process (int pid) { + struct thread_info *curr_tp = NULL; struct thread_info *tp; struct thread_info *tp_executing = NULL; - for (tp = thread_list; tp; tp = tp->next) - if (tp->state != THREAD_EXITED && ptid_get_pid (tp->ptid) == pid) + gdb_assert (pid != 0); + + /* Prefer the current thread if it's not executing. */ + if (ptid_get_pid (inferior_ptid) == pid) + { + /* 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; + } + + ALL_NON_EXITED_THREADS (tp) + if (ptid_get_pid (tp->ptid) == pid) { - if (tp->executing) - tp_executing = tp; - else + if (!tp->executing) return tp; + + tp_executing = tp; } + /* If both the current thread and all live threads are executing, + prefer the current thread. */ + if (curr_tp != NULL) + return curr_tp; + + /* Otherwise, just return an executing thread, if any. */ return tp_executing; } @@ -485,30 +718,29 @@ do_captured_list_thread_ids (struct ui_out *uiout, void *arg) { struct thread_info *tp; int num = 0; - struct cleanup *cleanup_chain; int current_thread = -1; update_thread_list (); - cleanup_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "thread-ids"); + { + ui_out_emit_tuple tuple_emitter (uiout, "thread-ids"); - for (tp = thread_list; tp; tp = tp->next) - { - if (tp->state == THREAD_EXITED) - continue; - - if (ptid_equal (tp->ptid, inferior_ptid)) - current_thread = tp->num; + for (tp = thread_list; tp; tp = tp->next) + { + if (tp->state == THREAD_EXITED) + continue; - num++; - ui_out_field_int (uiout, "thread-id", tp->num); - } + if (tp->ptid == inferior_ptid) + current_thread = tp->global_num; - do_cleanups (cleanup_chain); + num++; + uiout->field_int ("thread-id", tp->global_num); + } + } if (current_thread != -1) - ui_out_field_int (uiout, "current-thread-id", current_thread); - ui_out_field_int (uiout, "number-of-threads", num); + uiout->field_int ("current-thread-id", current_thread); + uiout->field_int ("number-of-threads", num); return GDB_RC_OK; } @@ -534,132 +766,277 @@ thread_alive (struct thread_info *tp) return 1; } -static void +/* See gdbthreads.h. */ + +void prune_threads (void) { - struct thread_info *tp, *next; + struct thread_info *tp, *tmp; - for (tp = thread_list; tp; tp = next) + ALL_THREADS_SAFE (tp, tmp) { - next = tp->next; if (!thread_alive (tp)) delete_thread (tp->ptid); } } +/* See gdbthreads.h. */ + void -thread_change_ptid (ptid_t old_ptid, ptid_t new_ptid) +delete_exited_threads (void) { - struct inferior *inf; - struct thread_info *tp; - - /* 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); - - tp = find_thread_ptid (old_ptid); - tp->ptid = new_ptid; + struct thread_info *tp, *tmp; - observer_notify_thread_ptid_changed (old_ptid, new_ptid); + ALL_THREADS_SAFE (tp, tmp) + { + if (tp->state == THREAD_EXITED) + delete_thread (tp->ptid); + } } -void -set_running (ptid_t ptid, int running) +/* Disable storing stack temporaries for the thread whose id is + stored in DATA. */ + +static void +disable_thread_stack_temporaries (void *data) { - struct thread_info *tp; - int all = ptid_equal (ptid, minus_one_ptid); + ptid_t *pd = (ptid_t *) data; + struct thread_info *tp = find_thread_ptid (*pd); - /* 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)) + if (tp != NULL) { - 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); + tp->stack_temporaries_enabled = 0; + VEC_free (value_ptr, tp->stack_temporaries); } - 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); - } + xfree (pd); } -static int -is_thread_state (ptid_t ptid, enum thread_state state) +/* 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; + struct thread_info *tp = find_thread_ptid (ptid); + ptid_t *data; + struct cleanup *c; - tp = find_thread_ptid (ptid); - gdb_assert (tp); - return tp->state == state; -} + gdb_assert (tp != NULL); -int -is_stopped (ptid_t ptid) -{ - return is_thread_state (ptid, THREAD_STOPPED); + 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 -is_exited (ptid_t ptid) +thread_stack_temporaries_enabled_p (ptid_t ptid) { - return is_thread_state (ptid, THREAD_EXITED); + struct thread_info *tp = find_thread_ptid (ptid); + + if (tp == NULL) + return 0; + else + return tp->stack_temporaries_enabled; } -int -is_running (ptid_t ptid) +/* Push V on to the stack temporaries of the thread with id PTID. */ + +void +push_thread_stack_temporary (ptid_t ptid, struct value *v) { - return is_thread_state (ptid, THREAD_RUNNING); + 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); } +/* Return 1 if VAL is among the stack temporaries of the thread + with id PTID. Return 0 otherwise. */ + int -any_running (void) +value_in_thread_stack_temporaries (struct value *val, ptid_t ptid) { - struct thread_info *tp; + struct thread_info *tp = find_thread_ptid (ptid); - for (tp = thread_list; tp; tp = tp->next) - if (tp->state == THREAD_RUNNING) - return 1; + gdb_assert (tp != NULL && tp->stack_temporaries_enabled); + if (!VEC_empty (value_ptr, tp->stack_temporaries)) + { + struct value *v; + int i; + + for (i = 0; VEC_iterate (value_ptr, tp->stack_temporaries, i, v); i++) + if (v == val) + return 1; + } return 0; } -int -is_executing (ptid_t ptid) +/* 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) { - struct thread_info *tp; + struct value *lastval = NULL; + struct thread_info *tp = find_thread_ptid (ptid); - tp = find_thread_ptid (ptid); - gdb_assert (tp); - return tp->executing; + gdb_assert (tp != NULL); + if (!VEC_empty (value_ptr, tp->stack_temporaries)) + lastval = VEC_last (value_ptr, tp->stack_temporaries); + + return lastval; } void -set_executing (ptid_t ptid, int executing) +thread_change_ptid (ptid_t old_ptid, ptid_t new_ptid) { + struct inferior *inf; struct thread_info *tp; - int all = ptid_equal (ptid, minus_one_ptid); + + /* It can happen that what we knew as the target inferior id + changes. E.g, target remote may only discover the remote process + pid after adding the inferior to GDB's list. */ + inf = find_inferior_ptid (old_ptid); + inf->pid = ptid_get_pid (new_ptid); + + tp = find_thread_ptid (old_ptid); + tp->ptid = new_ptid; + + observer_notify_thread_ptid_changed (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; + } +} + +/* Helper for set_running, that marks one thread either running or + stopped. */ + +static int +set_running_thread (struct thread_info *tp, int running) +{ + int started = 0; + + if (running && tp->state == THREAD_STOPPED) + started = 1; + tp->state = running ? THREAD_RUNNING : THREAD_STOPPED; + + if (!running) + { + /* If the thread is now marked stopped, remove it from + the step-over queue, so that we don't try to resume + it until the user wants it to. */ + if (tp->step_over_next != NULL) + thread_step_over_chain_remove (tp); + } + + return started; +} + +void +set_running (ptid_t ptid, int 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); +} + +static int +is_thread_state (ptid_t ptid, enum thread_state state) +{ + struct thread_info *tp; + + tp = find_thread_ptid (ptid); + gdb_assert (tp); + return tp->state == state; +} + +int +is_stopped (ptid_t ptid) +{ + return is_thread_state (ptid, THREAD_STOPPED); +} + +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); +} + +int +is_executing (ptid_t ptid) +{ + struct thread_info *tp; + + tp = find_thread_ptid (ptid); + gdb_assert (tp); + return tp->executing; +} + +void +set_executing (ptid_t ptid, int executing) +{ + struct thread_info *tp; + int all = ptid == minus_one_ptid; if (all || ptid_is_pid (ptid)) { @@ -673,13 +1050,29 @@ set_executing (ptid_t ptid, int executing) gdb_assert (tp); tp->executing = 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; +} + +/* 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); + int all = ptid == minus_one_ptid; if (all || ptid_is_pid (ptid)) { @@ -707,19 +1100,18 @@ finish_thread_state (ptid_t ptid) int all; int any_started = 0; - all = ptid_equal (ptid, minus_one_ptid); + 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 (tp->state == THREAD_EXITED) + continue; if (all || ptid_get_pid (ptid) == ptid_get_pid (tp->ptid)) { - if (tp->executing && tp->state == THREAD_STOPPED) + if (set_running_thread (tp, tp->executing)) any_started = 1; - tp->state = tp->executing ? THREAD_RUNNING : THREAD_STOPPED; } } } @@ -729,9 +1121,8 @@ finish_thread_state (ptid_t ptid) gdb_assert (tp); if (tp->state != THREAD_EXITED) { - if (tp->executing && tp->state == THREAD_STOPPED) + if (set_running_thread (tp, tp->executing)) any_started = 1; - tp->state = tp->executing ? THREAD_RUNNING : THREAD_STOPPED; } } @@ -742,43 +1133,126 @@ finish_thread_state (ptid_t ptid) void finish_thread_state_cleanup (void *arg) { - ptid_t *ptid_p = arg; + ptid_t *ptid_p = (ptid_t *) arg; gdb_assert (arg); finish_thread_state (*ptid_p); } -/* Prints the list of threads and their details on UIOUT. - This is a version of 'info_threads_command' suitable for - use from MI. - If REQUESTED_THREAD is not -1, it's the GDB id of the thread - that should be printed. Otherwise, all threads are - printed. - If PID is not -1, only print threads from the process PID. - Otherwise, threads from all attached PIDs are printed. - If both REQUESTED_THREAD and PID are not -1, then the thread - is printed if it belongs to the specified process. Otherwise, - an error is raised. */ +/* See gdbthread.h. */ + void -print_thread_info (struct ui_out *uiout, char *requested_threads, int pid) +validate_registers_access (void) +{ + /* No selected thread, no registers. */ + if (inferior_ptid == null_ptid) + error (_("No thread selected.")); + + /* Don't try to read from a dead thread. */ + if (is_exited (inferior_ptid)) + 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 (is_executing (inferior_ptid)) + error (_("Selected thread is running.")); +} + +/* See gdbthread.h. */ + +bool +can_access_registers_ptid (ptid_t ptid) +{ + /* No thread, no registers. */ + if (ptid == null_ptid) + return false; + + /* Don't try to read from a dead thread. */ + if (is_exited (ptid)) + return false; + + /* ... or from a spinning thread. FIXME: see validate_registers_access. */ + if (is_executing (ptid)) + return false; + + return true; +} + +int +pc_in_thread_step_range (CORE_ADDR pc, struct thread_info *thread) +{ + return (pc >= thread->control.step_range_start + && pc < thread->control.step_range_end); +} + +/* 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; + + 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; + } + + if (pid != -1 && ptid_get_pid (thr->ptid) != pid) + { + if (requested_threads != NULL && *requested_threads != '\0') + error (_("Requested thread not found in requested process")); + return 0; + } + + if (thr->state == THREAD_EXITED) + return 0; + + return 1; +} + +/* 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, + int global_ids, int pid, + int show_global_ids) { struct thread_info *tp; ptid_t current_ptid; - struct cleanup *old_chain; - char *extra_info, *name, *target_id; - int current_thread = -1; + const char *extra_info, *name, *target_id; + struct inferior *inf; + int default_inf_num = current_inferior ()->num; update_thread_list (); current_ptid = inferior_ptid; - /* We'll be switching threads temporarily. */ - old_chain = make_cleanup_restore_current_thread (); + struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); /* 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)) + if (uiout->is_mi_like_p ()) make_cleanup_ui_out_list_begin_end (uiout, "threads"); else { @@ -786,13 +1260,8 @@ print_thread_info (struct ui_out *uiout, char *requested_threads, int pid) for (tp = thread_list; tp; tp = tp->next) { - if (!number_is_in_list (requested_threads, tp->num)) - continue; - - if (pid != -1 && PIDGET (tp->ptid) != pid) - continue; - - if (tp->state == THREAD_EXITED) + if (!should_print_thread (requested_threads, default_inf_num, + global_ids, pid, tp)) continue; ++n_threads; @@ -801,210 +1270,238 @@ print_thread_info (struct ui_out *uiout, char *requested_threads, int pid) if (n_threads == 0) { if (requested_threads == NULL || *requested_threads == '\0') - ui_out_message (uiout, 0, _("No threads.\n")); + uiout->message (_("No threads.\n")); else - ui_out_message (uiout, 0, _("No threads match '%s'.\n"), + uiout->message (_("No threads match '%s'.\n"), requested_threads); do_cleanups (old_chain); return; } - make_cleanup_ui_out_table_begin_end (uiout, 4, n_threads, "threads"); + if (show_global_ids || uiout->is_mi_like_p ()) + make_cleanup_ui_out_table_begin_end (uiout, 5, n_threads, "threads"); + else + make_cleanup_ui_out_table_begin_end (uiout, 4, n_threads, "threads"); + + uiout->table_header (1, ui_left, "current", ""); - ui_out_table_header (uiout, 1, ui_left, "current", ""); - ui_out_table_header (uiout, 4, ui_left, "id", "Id"); - ui_out_table_header (uiout, 17, ui_left, "target-id", "Target Id"); - ui_out_table_header (uiout, 1, ui_left, "frame", "Frame"); - ui_out_table_body (uiout); + if (!uiout->is_mi_like_p ()) + uiout->table_header (4, ui_left, "id-in-tg", "Id"); + if (show_global_ids || uiout->is_mi_like_p ()) + uiout->table_header (4, ui_left, "id", "GId"); + uiout->table_header (17, ui_left, "target-id", "Target Id"); + uiout->table_header (1, ui_left, "frame", "Frame"); + uiout->table_body (); } - for (tp = thread_list; tp; tp = tp->next) - { - struct cleanup *chain2; - int core; + /* We'll be switching threads temporarily. */ + { + scoped_restore_current_thread restore_thread; - if (!number_is_in_list (requested_threads, tp->num)) - continue; + ALL_THREADS_BY_INFERIOR (inf, tp) + { + int core; - if (pid != -1 && PIDGET (tp->ptid) != pid) - { - if (requested_threads != NULL && *requested_threads != '\0') - error (_("Requested thread not found in requested process")); + if (!should_print_thread (requested_threads, default_inf_num, + global_ids, pid, tp)) continue; - } - if (ptid_equal (tp->ptid, current_ptid)) - current_thread = tp->num; + ui_out_emit_tuple tuple_emitter (uiout, NULL); - if (tp->state == THREAD_EXITED) - continue; - - chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + if (!uiout->is_mi_like_p ()) + { + if (tp->ptid == current_ptid) + uiout->field_string ("current", "*"); + else + uiout->field_skip ("current"); + } - if (ui_out_is_mi_like_p (uiout)) - { - /* Compatibility. */ - if (ptid_equal (tp->ptid, current_ptid)) - ui_out_text (uiout, "* "); - else - ui_out_text (uiout, " "); - } - else - { - if (ptid_equal (tp->ptid, current_ptid)) - ui_out_field_string (uiout, "current", "*"); - else - ui_out_field_skip (uiout, "current"); - } + if (!uiout->is_mi_like_p ()) + uiout->field_string ("id-in-tg", print_thread_id (tp)); - ui_out_field_int (uiout, "id", tp->num); + 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. */ + /* 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); + 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 (ui_out_is_mi_like_p (uiout)) - { - ui_out_field_string (uiout, "target-id", target_id); - if (extra_info) - ui_out_field_string (uiout, "details", extra_info); - if (name) - ui_out_field_string (uiout, "name", name); - } - else - { - struct cleanup *str_cleanup; - char *contents; - - if (extra_info && name) - contents = xstrprintf ("%s \"%s\" (%s)", target_id, - name, extra_info); - else if (extra_info) - contents = xstrprintf ("%s (%s)", target_id, extra_info); - else if (name) - contents = xstrprintf ("%s \"%s\"", target_id, name); - else - contents = xstrdup (target_id); - str_cleanup = make_cleanup (xfree, contents); - - ui_out_field_string (uiout, "target-id", contents); - do_cleanups (str_cleanup); - } - - if (tp->state == THREAD_RUNNING) - ui_out_text (uiout, "(running)\n"); - else - { - /* The switch below puts us at the top of the stack (leaf - frame). */ - switch_to_thread (tp->ptid); - print_stack_frame (get_selected_frame (NULL), - /* For MI output, print frame level. */ - ui_out_is_mi_like_p (uiout), - LOCATION); - } + if (uiout->is_mi_like_p ()) + { + uiout->field_string ("target-id", target_id); + if (extra_info) + uiout->field_string ("details", extra_info); + if (name) + uiout->field_string ("name", name); + } + else + { + struct cleanup *str_cleanup; + char *contents; + + if (extra_info && name) + contents = xstrprintf ("%s \"%s\" (%s)", target_id, + name, extra_info); + else if (extra_info) + contents = xstrprintf ("%s (%s)", target_id, extra_info); + else if (name) + contents = xstrprintf ("%s \"%s\"", target_id, name); + else + contents = xstrdup (target_id); + str_cleanup = make_cleanup (xfree, contents); + + uiout->field_string ("target-id", contents); + do_cleanups (str_cleanup); + } - if (ui_out_is_mi_like_p (uiout)) - { - char *state = "stopped"; + 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 (tp->state == THREAD_RUNNING) - state = "running"; - ui_out_field_string (uiout, "state", state); - } + if (uiout->is_mi_like_p ()) + { + const char *state = "stopped"; - core = target_core_of_thread (tp->ptid); - if (ui_out_is_mi_like_p (uiout) && core != -1) - ui_out_field_int (uiout, "core", core); + if (tp->state == THREAD_RUNNING) + state = "running"; + uiout->field_string ("state", state); + } - do_cleanups (chain2); + core = target_core_of_thread (tp->ptid); + if (uiout->is_mi_like_p () && core != -1) + uiout->field_int ("core", core); } - /* Restores the current thread and the frame selected before - the "info threads" command. */ + /* This end scope restores the current thread and the frame + selected before the "info threads" command. */ + } + do_cleanups (old_chain); 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 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) + { + int num = ptid_to_global_thread_id (inferior_ptid); + + gdb_assert (num != 0); + uiout->field_int ("current-thread-id", num); + } + + if (inferior_ptid != null_ptid && is_exited (inferior_ptid)) + uiout->message ("\n\ +The current thread has terminated. See `help thread'.\n", + print_thread_id (inferior_thread ())); + else if (thread_list != NULL && inferior_ptid == null_ptid) + uiout->message ("\n\ No selected thread. See `help thread'.\n"); } } -/* Print information about currently known threads +/* See gdbthread.h. */ + +void +print_thread_info (struct ui_out *uiout, char *requested_threads, int pid) +{ + print_thread_info_1 (uiout, requested_threads, 1, pid, 0); +} - Optional ARG is a thread id, or list of thread ids. +/* 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. */ + 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 (current_uiout, arg, -1); + int show_global_ids = 0; + + if (arg != NULL + && check_for_argument (&arg, "-gid", sizeof ("-gid") - 1)) + { + arg = skip_spaces (arg); + show_global_ids = 1; + } + + print_thread_info_1 (current_uiout, arg, 0, -1, show_global_ids); } -/* Switch from one thread to another. */ +/* See gdbthread.h. */ void -switch_to_thread (ptid_t ptid) +switch_to_thread_no_regs (struct thread_info *thread) { - /* Switch the program space as well, if we can infer it from the now - current thread. Otherwise, it's up to the caller to select the - space it wants. */ - if (!ptid_equal (ptid, null_ptid)) - { - struct inferior *inf; + struct inferior *inf = thread->inf; - inf = find_inferior_pid (ptid_get_pid (ptid)); - gdb_assert (inf != NULL); - set_current_program_space (inf->pspace); - set_current_inferior (inf); - } + set_current_program_space (inf->pspace); + set_current_inferior (inf); + + inferior_ptid = thread->ptid; + stop_pc = ~(CORE_ADDR) 0; +} + +/* Switch to no thread selected. */ + +static void +switch_to_no_thread () +{ + if (inferior_ptid == null_ptid) + return; + + inferior_ptid = null_ptid; + reinit_frame_cache (); + stop_pc = ~(CORE_ADDR) 0; +} + +/* Switch from one thread to another. */ + +static void +switch_to_thread (thread_info *thr) +{ + gdb_assert (thr != NULL); - if (ptid_equal (ptid, inferior_ptid)) + 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; + if (thr->state != THREAD_EXITED + && !thr->executing) + stop_pc = regcache_read_pc (get_thread_regcache (thr->ptid)); } -static void -restore_current_thread (ptid_t ptid) +/* See gdbthread.h. */ + +void +switch_to_thread (ptid_t ptid) { - switch_to_thread (ptid); + if (ptid == null_ptid) + switch_to_no_thread (); + else + switch_to_thread (find_thread_ptid (ptid)); } static void @@ -1054,87 +1551,65 @@ restore_selected_frame (struct frame_id a_frame_id, int frame_level) select_frame (get_current_frame ()); /* Warn the user. */ - if (frame_level > 0 && !ui_out_is_mi_like_p (current_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 + if (inferior_ptid != null_ptid + && m_was_stopped && is_stopped (inferior_ptid) && target_has_registers && target_has_stack && target_has_memory) - restore_selected_frame (old->selected_frame_id, - old->selected_frame_level); -} - -static void -restore_current_thread_cleanup_dtor (void *arg) -{ - struct current_thread_cleanup *old = arg; - struct thread_info *tp; + restore_selected_frame (m_selected_frame_id, m_selected_frame_level); - 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; + m_thread = NULL; + m_inf = current_inferior (); - old = xmalloc (sizeof (struct current_thread_cleanup)); - old->inferior_ptid = inferior_ptid; - old->inf_id = current_inferior ()->num; - - 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 = find_thread_ptid (inferior_ptid); + struct frame_info *frame; + + gdb_assert (tp != NULL); + + m_was_stopped = tp->state == THREAD_STOPPED; + if (m_was_stopped && target_has_registers && target_has_stack && target_has_memory) @@ -1149,16 +1624,70 @@ make_cleanup_restore_current_thread (void) else frame = NULL; - old->selected_frame_id = get_frame_id (frame); - old->selected_frame_level = frame_relative_level (frame); + m_selected_frame_id = get_frame_id (frame); + m_selected_frame_level = frame_relative_level (frame); - tp = find_thread_ptid (inferior_ptid); - if (tp) - tp->refcount++; + tp->incref (); + m_thread = tp; } - return make_cleanup_dtor (do_restore_current_thread_cleanup, old, - restore_current_thread_cleanup_dtor); + 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; +} + +/* If true, tp_array_compar should sort in ascending order, otherwise + in descending order. */ + +static bool tp_array_compar_ascending; + +/* 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. */ + +static bool +tp_array_compar (const thread_info *a, const thread_info *b) +{ + if (a->inf->num != b->inf->num) + { + if (tp_array_compar_ascending) + return a->inf->num < b->inf->num; + else + return a->inf->num > b->inf->num; + } + + if (tp_array_compar_ascending) + return (a->per_inf_num < b->per_inf_num); + else + return (a->per_inf_num > b->per_inf_num); } /* Apply a GDB command to a list of threads. List syntax is a whitespace @@ -1172,85 +1701,163 @@ make_cleanup_restore_current_thread (void) static void thread_apply_all_command (char *cmd, int from_tty) { - struct thread_info *tp; - struct cleanup *old_chain; char *saved_cmd; + tp_array_compar_ascending = false; + if (cmd != NULL + && check_for_argument (&cmd, "-ascending", strlen ("-ascending"))) + { + cmd = skip_spaces (cmd); + tp_array_compar_ascending = true; + } + if (cmd == NULL || *cmd == '\000') error (_("Please specify a command following the thread ID list")); update_thread_list (); - old_chain = make_cleanup_restore_current_thread (); - /* 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)) + + int tc = live_threads_count (); + if (tc != 0) + { + /* Save a copy of the thread list and increment each thread's + refcount while executing the command in the context of each + thread, in case the command is one that wipes threads. E.g., + detach, kill, disconnect, etc., or even normally continuing + over an inferior or thread exit. */ + std::vector thr_list_cpy; + thr_list_cpy.reserve (tc); + { - switch_to_thread (tp->ptid); + thread_info *tp; + + ALL_NON_EXITED_THREADS (tp) + { + thr_list_cpy.push_back (tp); + } - 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. */ + gdb_assert (thr_list_cpy.size () == tc); } - do_cleanups (old_chain); + /* 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); + + 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); + + /* Restore exact command used previously. */ + strcpy (cmd, saved_cmd); + } + } } +/* Implementation of the "thread apply" command. */ + static void thread_apply_command (char *tidlist, int from_tty) { - char *cmd; + char *cmd = NULL; struct cleanup *old_chain; char *saved_cmd; - struct get_number_or_range_state state; + 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 (*cmd == '\000') + if (!parser.get_tid_range (&inf_num, &thr_start, &thr_end)) + { + cmd = (char *) parser.cur_tok (); + break; + } + } + + if (cmd == NULL) error (_("Please specify a command following the thread ID list")); + if (tidlist == cmd || !isalpha (cmd[0])) + invalid_thread_id_error (cmd); + /* 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); - init_number_or_range (&state, tidlist); - while (!state.finished && state.string < cmd) + scoped_restore_current_thread restore_thread; + + parser.init (tidlist, current_inferior ()->num); + while (!parser.finished () && parser.cur_tok () < cmd) { - struct thread_info *tp; - int start; - char *p = tidlist; + struct thread_info *tp = NULL; + struct inferior *inf; + int inf_num, thr_num; - start = get_number_or_range (&state); + parser.get_tid (&inf_num, &thr_num); + inf = find_inferior_id (inf_num); + if (inf != NULL) + tp = find_thread_id (inf, thr_num); - make_cleanup_restore_current_thread (); + if (parser.in_star_range ()) + { + if (inf == NULL) + { + warning (_("Unknown inferior %d"), inf_num); + parser.skip_range (); + continue; + } - tp = find_thread_id (start); + /* No use looking for threads past the highest thread number + the inferior ever had. */ + if (thr_num >= inf->highest_thread_num) + parser.skip_range (); - if (!tp) - warning (_("Unknown thread %d."), start); - else if (!thread_alive (tp)) - warning (_("Thread %d has terminated."), start); - else - { - switch_to_thread (tp->ptid); + /* Be quiet about unknown threads numbers. */ + if (tp == NULL) + continue; + } - printf_filtered (_("\nThread %d (%s):\n"), tp->num, - target_pid_to_str (inferior_ptid)); - execute_command (cmd, from_tty); + if (tp == NULL) + { + if (show_inferior_qualified_tids () || parser.tid_is_qualified ()) + warning (_("Unknown thread %d.%d"), inf_num, thr_num); + else + warning (_("Unknown thread %d"), thr_num); + continue; + } - /* Restore exact command used previously. */ - strcpy (cmd, saved_cmd); + if (!thread_alive (tp)) + { + warning (_("Thread %s has terminated."), print_thread_id (tp)); + continue; } + + switch_to_thread (tp->ptid); + + 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); } do_cleanups (old_chain); @@ -1259,31 +1866,55 @@ thread_apply_command (char *tidlist, int from_tty) /* Switch to the specified thread. Will dispatch off to thread_apply_command if prefix of arg is `apply'. */ -static void +void thread_command (char *tidstr, int from_tty) { - if (!tidstr) + if (tidstr == NULL) { - if (ptid_equal (inferior_ptid, null_ptid)) + if (inferior_ptid == null_ptid) error (_("No thread selected")); if (target_has_stack) { + struct thread_info *tp = inferior_thread (); + if (is_exited (inferior_ptid)) - printf_filtered (_("[Current thread is %d (%s) (exited)]\n"), - pid_to_thread_id (inferior_ptid), + printf_filtered (_("[Current thread is %s (%s) (exited)]\n"), + print_thread_id (tp), target_pid_to_str (inferior_ptid)); else - printf_filtered (_("[Current thread is %d (%s)]\n"), - pid_to_thread_id (inferior_ptid), + printf_filtered (_("[Current thread is %s (%s)]\n"), + print_thread_id (tp), target_pid_to_str (inferior_ptid)); } else error (_("No stack.")); - return; } + else + { + ptid_t previous_ptid = inferior_ptid; + enum gdb_rc result; - gdb_thread_select (current_uiout, tidstr, NULL); + result = gdb_thread_select (current_uiout, tidstr, NULL); + + /* If thread switch did not succeed don't notify or print. */ + if (result == GDB_RC_FAIL) + return; + + /* 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 + { + observer_notify_user_selected_context_changed (USER_SELECTED_THREAD + | USER_SELECTED_FRAME); + } + } } /* Implementation of `thread name'. */ @@ -1293,11 +1924,10 @@ thread_name_command (char *arg, int from_tty) { struct thread_info *info; - if (ptid_equal (inferior_ptid, null_ptid)) + if (inferior_ptid == null_ptid) error (_("No thread selected")); - while (arg && isspace (*arg)) - ++arg; + arg = skip_spaces (arg); info = inferior_thread (); xfree (info->name); @@ -1310,7 +1940,7 @@ static void thread_find_command (char *arg, int from_tty) { struct thread_info *tp; - char *tmp; + const char *tmp; unsigned long match = 0; if (arg == NULL || *arg == '\0') @@ -1325,32 +1955,32 @@ thread_find_command (char *arg, int from_tty) { if (tp->name != NULL && re_exec (tp->name)) { - printf_filtered (_("Thread %d has name '%s'\n"), - tp->num, tp->name); + printf_filtered (_("Thread %s has name '%s'\n"), + print_thread_id (tp), tp->name); match++; } tmp = target_thread_name (tp); if (tmp != NULL && re_exec (tmp)) { - printf_filtered (_("Thread %d has target name '%s'\n"), - tp->num, tmp); + printf_filtered (_("Thread %s has target name '%s'\n"), + print_thread_id (tp), tmp); match++; } tmp = target_pid_to_str (tp->ptid); if (tmp != NULL && re_exec (tmp)) { - printf_filtered (_("Thread %d has target id '%s'\n"), - tp->num, tmp); + printf_filtered (_("Thread %s has target id '%s'\n"), + print_thread_id (tp), 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); + printf_filtered (_("Thread %s has extra info '%s'\n"), + print_thread_id (tp), tmp); match++; } } @@ -1362,49 +1992,40 @@ thread_find_command (char *arg, int from_tty) int print_thread_events = 1; static void show_print_thread_events (struct ui_file *file, int from_tty, - struct cmd_list_element *c, const char *value) + struct cmd_list_element *c, const char *value) { fprintf_filtered (file, _("Printing of thread events is %s.\n"), - value); + value); } static int -do_captured_thread_select (struct ui_out *uiout, void *tidstr) +do_captured_thread_select (struct ui_out *uiout, void *tidstr_v) { - int num; + const char *tidstr = (const char *) tidstr_v; struct thread_info *tp; - num = value_as_long (parse_and_eval (tidstr)); - - tp = find_thread_id (num); + if (uiout->is_mi_like_p ()) + { + int num = value_as_long (parse_and_eval (tidstr)); - if (!tp) - error (_("Thread ID %d not known."), num); + tp = find_thread_global_id (num); + if (tp == NULL) + error (_("Thread ID %d not known."), num); + } + else + { + tp = parse_thread_id (tidstr, NULL); + gdb_assert (tp != NULL); + } if (!thread_alive (tp)) - error (_("Thread ID %d has terminated."), num); + error (_("Thread ID %s has terminated."), tidstr); switch_to_thread (tp->ptid); annotate_thread_changed (); - 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, ")]"); - - /* 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 - { - ui_out_text (uiout, "\n"); - print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC); - } - /* Since the current thread may have changed, see if there is any exited thread we can now delete. */ prune_threads (); @@ -1412,6 +2033,48 @@ do_captured_thread_select (struct ui_out *uiout, void *tidstr) return GDB_RC_OK; } +/* 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 (); + 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); + } + 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 (")]"); + } + } + + 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) { @@ -1421,38 +2084,106 @@ gdb_thread_select (struct ui_out *uiout, char *tidstr, char **error_message) return GDB_RC_OK; } +/* Update the 'threads_executing' global based on the threads we know + about right now. */ + +static void +update_threads_executing (void) +{ + struct thread_info *tp; + + threads_executing = 0; + ALL_NON_EXITED_THREADS (tp) + { + 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 (tp == NULL) + int_val = 0; + else if (global) + int_val = tp->global_num; + else + int_val = tp->per_inf_num; - return value_from_longest (builtin_type (gdbarch)->builtin_int, - (tp ? tp->num : 0)); + 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. */ + +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, + 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.")); +Usage: info threads [-gid] [ID]...\n\ +-gid: Show global thread IDs.\n\ +If ID is given, it is a space-separated list of IDs of threads to display.\n\ +Otherwise, all threads are displayed.")); add_prefix_cmd ("thread", class_run, thread_command, _("\ Use this command to switch between threads.\n\ @@ -1464,7 +2195,14 @@ The new thread ID must be currently known."), &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); + _("\ +Apply a command to all threads.\n\ +\n\ +Usage: thread apply all [-ascending] \n\ +-ascending: Call for all threads in ascending order.\n\ + The default is descending order.\ +"), + &thread_apply_list); add_cmd ("name", class_run, thread_name_command, _("Set the current thread's name.\n\ @@ -1477,16 +2215,16 @@ Usage: thread find REGEXP\n\ Will display thread ids whose name, target ID, or extra info matches REGEXP."), &thread_cmd_list); - if (!xdb_commands) - add_com_alias ("t", "thread", class_run, 1); + add_com_alias ("t", "thread", class_run, 1); add_setshow_boolean_cmd ("thread-events", no_class, - &print_thread_events, _("\ + &print_thread_events, _("\ Set printing of thread events (such as thread start and exit)."), _("\ Show printing of thread events (such as thread start and exit)."), NULL, - NULL, - show_print_thread_events, - &setprintlist, &showprintlist); + NULL, + show_print_thread_events, + &setprintlist, &showprintlist); - create_internalvar_type_lazy ("_thread", thread_id_make_value); + create_internalvar_type_lazy ("_thread", &thread_funcs, NULL); + create_internalvar_type_lazy ("_gthread", >hread_funcs, NULL); }