X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fthread.c;h=75bfb4771b268df7fafb09efe86608fbc9061ef5;hb=73e6209faecc21516a981ed86a27b259f506098c;hp=1be325fef62cad5c9b2f6d3c8002de6ad3edcad2;hpb=186c406b1903ea0f146f05ba5570fbf46bff3eab;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/thread.c b/gdb/thread.c index 1be325fef6..75bfb4771b 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 - Free Software Foundation, Inc. + Copyright (C) 1986-2016 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 @@ -43,35 +40,48 @@ #include "observer.h" #include "annotate.h" #include "cli/cli-decode.h" +#include "gdb_regex.h" +#include "cli/cli-utils.h" +#include "thread-fsm.h" +#include "tid-parse.h" -/* Definition of struct thread_info exported to gdbthread.h */ +/* Definition of struct thread_info exported to gdbthread.h. */ -/* Prototypes for exported functions. */ +/* Prototypes for exported functions. */ void _initialize_thread (void); -/* Prototypes for local functions. */ +/* 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); -/* Frontend view of the thread state. Possible extensions: stepping, - finishing, until(ling),... */ -enum thread_state +/* Data to cleanup thread array. */ + +struct thread_array_cleanup { - THREAD_STOPPED, - THREAD_RUNNING, - THREAD_EXITED, + /* Array of thread pointers used to set + reference count. */ + struct thread_info **tp_array; + + /* Thread count in the array. */ + int count; }; + struct thread_info* inferior_thread (void) { @@ -80,23 +90,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); + thread_fsm_delete (thr->thread_fsm); + thr->thread_fsm = NULL; } } @@ -107,40 +179,31 @@ 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); - discard_all_intermediate_continuations_thread (tp); - discard_all_continuations_thread (tp); + btrace_teardown (tp); - delete_longjmp_breakpoint (tp->num); + thread_cancel_execution_command (tp); } static void free_thread (struct thread_info *tp) { - clear_thread_inferior_resources (tp); - - if (tp->private) + if (tp->priv) { if (tp->private_dtor) - tp->private_dtor (tp->private); + tp->private_dtor (tp->priv); else - xfree (tp->private); + xfree (tp->priv); } + xfree (tp->name); xfree (tp); } @@ -161,26 +224,41 @@ init_thread_list (void) } 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; - tp = xcalloc (1, sizeof (*tp)); + gdb_assert (inf != NULL); + + tp = XCNEW (struct thread_info); tp->ptid = ptid; - tp->num = ++highest_thread_num; - tp->next = thread_list; - thread_list = tp; + tp->global_num = ++highest_thread_num; + tp->inf = inf; + tp->per_inf_num = ++inf->highest_thread_num; + + if (thread_list == NULL) + thread_list = tp; + else + { + struct thread_info *last; + + for (last = thread_list; last->next != NULL; last = last->next) + ; + last->next = tp; + } /* Nothing to follow yet. */ tp->pending_follow.kind = TARGET_WAITKIND_SPURIOUS; - tp->state_ = THREAD_STOPPED; + tp->state = THREAD_STOPPED; + tp->suspend.waitstatus.kind = TARGET_WAITKIND_IGNORE; return tp; } @@ -189,6 +267,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) @@ -206,10 +286,10 @@ add_thread_silent (ptid_t ptid) if (ptid_equal (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; + tp->state = THREAD_EXITED; switch_to_thread (null_ptid); /* Now we can delete it. */ @@ -217,7 +297,7 @@ add_thread_silent (ptid_t ptid) /* 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); @@ -230,18 +310,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)); @@ -256,6 +336,86 @@ add_thread (ptid_t ptid) return add_thread_with_info (ptid, NULL); } +/* 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 @@ -272,18 +432,22 @@ delete_thread_1 (ptid_t ptid, int silent) if (!tp) return; + /* Dead threads don't need to step-over. Remove from queue. */ + if (tp->step_over_next != NULL) + thread_step_over_chain_remove (tp); + /* 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) + 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); @@ -293,15 +457,19 @@ delete_thread_1 (ptid_t ptid, int silent) 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); } @@ -322,12 +490,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->num == num) + 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->inf == inf && tp->per_inf_num == thr_num) return tp; return NULL; @@ -389,38 +569,38 @@ thread_count (void) } 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; + 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 @@ -432,7 +612,7 @@ in_thread_list (ptid_t ptid) if (ptid_equal (tp->ptid, ptid)) return 1; - return 0; /* Never heard of 'im */ + return 0; /* Never heard of 'im. */ } /* Finds the first thread of the inferior given by PID. If PID is -1, @@ -445,7 +625,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; @@ -456,7 +636,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; @@ -466,23 +652,45 @@ 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_running = NULL; + struct thread_info *tp_executing = NULL; - for (tp = thread_list; tp; tp = tp->next) + 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->state_ == THREAD_STOPPED) + if (!tp->executing) return tp; - else if (tp->state_ == THREAD_RUNNING) - tp_running = tp; + + tp_executing = tp; } - return tp_running; + /* 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; } /* Print a list of thread ids currently known, and the total number of - threads. To be used from within catch_errors. */ + threads. To be used from within catch_errors. */ static int do_captured_list_thread_ids (struct ui_out *uiout, void *arg) { @@ -497,14 +705,14 @@ do_captured_list_thread_ids (struct ui_out *uiout, void *arg) 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)) - current_thread = tp->num; + current_thread = tp->global_num; num++; - ui_out_field_int (uiout, "thread-id", tp->num); + ui_out_field_int (uiout, "thread-id", tp->global_num); } do_cleanups (cleanup_chain); @@ -516,7 +724,7 @@ do_captured_list_thread_ids (struct ui_out *uiout, void *arg) } /* Official gdblib interface function to get a list of thread ids and - the total number. */ + the total number. */ enum gdb_rc gdb_list_thread_ids (struct ui_out *uiout, char **error_message) { @@ -526,30 +734,147 @@ gdb_list_thread_ids (struct ui_out *uiout, char **error_message) return GDB_RC_OK; } -/* Return true if TP is an active thread. */ +/* Return true if TP is an active thread. */ static int thread_alive (struct thread_info *tp) { - if (tp->state_ == THREAD_EXITED) + if (tp->state == THREAD_EXITED) return 0; if (!target_thread_alive (tp->ptid)) return 0; return 1; } -static void +/* See gdbthreads.h. */ + +void prune_threads (void) { - struct thread_info *tp, *next; + 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 +delete_exited_threads (void) +{ + struct thread_info *tp, *tmp; + + ALL_THREADS_SAFE (tp, tmp) + { + if (tp->state == THREAD_EXITED) + delete_thread (tp->ptid); + } +} + +/* 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); +} + +/* 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) +{ + struct thread_info *tp = find_thread_ptid (ptid); + + if (tp == NULL) + return 0; + 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) +{ + 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 +value_in_thread_stack_temporaries (struct value *val, ptid_t ptid) +{ + 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 (i = 0; VEC_iterate (value_ptr, tp->stack_temporaries, i, v); i++) + if (v == val) + return 1; + } + + return 0; +} + +/* 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 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); + + return lastval; +} + void thread_change_ptid (ptid_t old_ptid, ptid_t new_ptid) { @@ -559,7 +884,7 @@ thread_change_ptid (ptid_t old_ptid, ptid_t new_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_pid (ptid_get_pid (old_ptid)); + inf = find_inferior_ptid (old_ptid); inf->pid = ptid_get_pid (new_ptid); tp = find_thread_ptid (old_ptid); @@ -568,44 +893,84 @@ thread_change_ptid (ptid_t old_ptid, ptid_t 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_equal (ptid, minus_one_ptid); + + if (all || ptid_is_pid (ptid)) + { + for (tp = thread_list; tp; tp = tp->next) + if (all || ptid_get_pid (tp->ptid) == ptid_get_pid (ptid)) + tp->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_equal (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)) { - 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) + if (tp->state == THREAD_EXITED) continue; - if (running && tp->state_ == THREAD_STOPPED) + + if (set_running_thread (tp, running)) any_started = 1; - tp->state_ = running ? THREAD_RUNNING : THREAD_STOPPED; } - if (any_started) - observer_notify_target_resumed (ptid); } else { - int started = 0; - tp = find_thread_ptid (ptid); - gdb_assert (tp); - gdb_assert (tp->state_ != THREAD_EXITED); - if (running && tp->state_ == THREAD_STOPPED) - started = 1; - tp->state_ = running ? THREAD_RUNNING : THREAD_STOPPED; - if (started) - observer_notify_target_resumed (ptid); + 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 @@ -615,7 +980,7 @@ is_thread_state (ptid_t ptid, enum thread_state state) tp = find_thread_ptid (ptid); gdb_assert (tp); - return tp->state_ == state; + return tp->state == state; } int @@ -636,18 +1001,6 @@ is_running (ptid_t ptid) return is_thread_state (ptid, THREAD_RUNNING); } -int -any_running (void) -{ - struct thread_info *tp; - - for (tp = thread_list; tp; tp = tp->next) - if (tp->state_ == THREAD_RUNNING) - return 1; - - return 0; -} - int is_executing (ptid_t ptid) { @@ -655,7 +1008,7 @@ is_executing (ptid_t ptid) tp = find_thread_ptid (ptid); gdb_assert (tp); - return tp->executing_; + return tp->executing; } void @@ -668,14 +1021,30 @@ set_executing (ptid_t ptid, int executing) { 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; } + + /* 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 (ptid_equal (minus_one_ptid, ptid)) + threads_executing = 0; +} + +/* See gdbthread.h. */ + +int +threads_are_executing (void) +{ + return threads_executing; } void @@ -716,13 +1085,12 @@ finish_thread_state (ptid_t ptid) { 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 (set_running_thread (tp, tp->executing)) any_started = 1; - tp->state_ = tp->executing_ ? THREAD_RUNNING : THREAD_STOPPED; } } } @@ -730,11 +1098,10 @@ finish_thread_state (ptid_t ptid) { 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 (set_running_thread (tp, tp->executing)) any_started = 1; - tp->state_ = tp->executing_ ? THREAD_RUNNING : THREAD_STOPPED; } } @@ -745,32 +1112,98 @@ 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_thread_command' suitable for - use from MI. - If REQUESTED_THREAD is not -1, it's the GDB id of the thread - that should be printed. Otherwise, all threads are - printed. - If PID is not -1, only print threads from the process PID. - Otherwise, threads from all attached PIDs are printed. - If both REQUESTED_THREAD and PID are not -1, then the thread - is printed if it belongs to the specified process. Otherwise, - an error is raised. */ +/* See gdbthread.h. */ + void -print_thread_info (struct ui_out *uiout, int requested_thread, int pid) +validate_registers_access (void) +{ + /* No selected thread, no registers. */ + if (ptid_equal (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.")); +} + +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; + const char *extra_info, *name, *target_id; int current_thread = -1; + struct inferior *inf; + int default_inf_num = current_inferior ()->num; update_thread_list (); current_ptid = inferior_ptid; @@ -778,49 +1211,127 @@ print_thread_info (struct ui_out *uiout, int requested_thread, int pid) /* We'll be switching threads temporarily. */ old_chain = make_cleanup_restore_current_thread (); - make_cleanup_ui_out_list_begin_end (uiout, "threads"); - for (tp = thread_list; tp; tp = tp->next) + /* For backward compatibility, we make a list for MI. A table is + preferable for the CLI, though, because it shows table + headers. */ + if (ui_out_is_mi_like_p (uiout)) + make_cleanup_ui_out_list_begin_end (uiout, "threads"); + else { - struct cleanup *chain2; - int core; + int n_threads = 0; - if (requested_thread != -1 && tp->num != requested_thread) - continue; + for (tp = thread_list; tp; tp = tp->next) + { + if (!should_print_thread (requested_threads, default_inf_num, + global_ids, pid, tp)) + continue; + + ++n_threads; + } - if (pid != -1 && PIDGET (tp->ptid) != pid) + if (n_threads == 0) { - if (requested_thread != -1) - error (_("Requested thread not found in requested process")); - continue; + if (requested_threads == NULL || *requested_threads == '\0') + ui_out_message (uiout, 0, _("No threads.\n")); + else + ui_out_message (uiout, 0, _("No threads match '%s'.\n"), + requested_threads); + do_cleanups (old_chain); + return; } + if (show_global_ids || ui_out_is_mi_like_p (uiout)) + 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"); + + ui_out_table_header (uiout, 1, ui_left, "current", ""); + + if (!ui_out_is_mi_like_p (uiout)) + ui_out_table_header (uiout, 4, ui_left, "id-in-tg", "Id"); + if (show_global_ids || ui_out_is_mi_like_p (uiout)) + ui_out_table_header (uiout, 4, ui_left, "id", "GId"); + 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); + } + + ALL_THREADS_BY_INFERIOR (inf, tp) + { + struct cleanup *chain2; + int core; + if (ptid_equal (tp->ptid, current_ptid)) - current_thread = tp->num; + current_thread = tp->global_num; - if (tp->state_ == THREAD_EXITED) + if (!should_print_thread (requested_threads, default_inf_num, + global_ids, pid, tp)) continue; chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - if (ptid_equal (tp->ptid, current_ptid)) - ui_out_text (uiout, "* "); + 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 - ui_out_text (uiout, " "); + { + if (ptid_equal (tp->ptid, current_ptid)) + ui_out_field_string (uiout, "current", "*"); + else + ui_out_field_skip (uiout, "current"); + } + + if (!ui_out_is_mi_like_p (uiout)) + ui_out_field_string (uiout, "id-in-tg", print_thread_id (tp)); + + if (show_global_ids || ui_out_is_mi_like_p (uiout)) + ui_out_field_int (uiout, "id", tp->global_num); - ui_out_field_int (uiout, "id", tp->num); - ui_out_text (uiout, " "); - ui_out_field_string (uiout, "target-id", target_pid_to_str (tp->ptid)); + /* 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); - if (extra_info) + name = tp->name ? tp->name : target_thread_name (tp); + + if (ui_out_is_mi_like_p (uiout)) { - ui_out_text (uiout, " ("); - ui_out_field_string (uiout, "details", extra_info); - ui_out_text (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); } - ui_out_text (uiout, " "); - if (tp->state_ == THREAD_RUNNING) + if (tp->state == THREAD_RUNNING) ui_out_text (uiout, "(running)\n"); else { @@ -830,14 +1341,14 @@ print_thread_info (struct ui_out *uiout, int requested_thread, int pid) print_stack_frame (get_selected_frame (NULL), /* For MI output, print frame level. */ ui_out_is_mi_like_p (uiout), - LOCATION); + LOCATION, 0); } if (ui_out_is_mi_like_p (uiout)) { char *state = "stopped"; - if (tp->state_ == THREAD_RUNNING) + if (tp->state == THREAD_RUNNING) state = "running"; ui_out_field_string (uiout, "state", state); } @@ -853,41 +1364,74 @@ print_thread_info (struct ui_out *uiout, int requested_thread, int pid) 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 - || 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 (ui_out_is_mi_like_p (uiout) + && !ptid_equal (inferior_ptid, null_ptid)) + { + int num = ptid_to_global_thread_id (inferior_ptid); - if (current_thread != -1 && is_exited (current_ptid)) + gdb_assert (num != 0); + ui_out_field_int (uiout, "current-thread-id", num); + } + + if (!ptid_equal (inferior_ptid, null_ptid) && is_exited (inferior_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)) +The current thread has terminated. See `help thread'.\n", + print_thread_id (inferior_thread ())); + else if (thread_list != NULL + && ptid_equal (inferior_ptid, null_ptid)) ui_out_message (uiout, 0, "\n\ No selected thread. See `help thread'.\n"); } } +/* See gdbthread.h. */ -/* Print information about currently known threads +void +print_thread_info (struct ui_out *uiout, char *requested_threads, int pid) +{ + print_thread_info_1 (uiout, requested_threads, 1, pid, 0); +} - * 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. - */ +/* Implementation of the "info threads" command. + + Note: this has the drawback that it _really_ switches + threads, which frees the frame cache. A no-side + effects info-threads command would be nicer. */ static void info_threads_command (char *arg, int from_tty) { - print_thread_info (uiout, -1, -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_no_regs (struct thread_info *thread) +{ + struct inferior *inf; + + inf = find_inferior_ptid (thread->ptid); + gdb_assert (inf != NULL); + set_current_program_space (inf->pspace); + set_current_inferior (inf); + + inferior_ptid = thread->ptid; + stop_pc = ~(CORE_ADDR) 0; +} + +/* Switch from one thread to another. */ void switch_to_thread (ptid_t ptid) @@ -899,7 +1443,7 @@ switch_to_thread (ptid_t ptid) { struct inferior *inf; - inf = find_inferior_pid (ptid_get_pid (ptid)); + inf = find_inferior_ptid (ptid); gdb_assert (inf != NULL); set_current_program_space (inf->pspace); set_current_inferior (inf); @@ -910,7 +1454,6 @@ switch_to_thread (ptid_t ptid) inferior_ptid = ptid; 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 @@ -935,6 +1478,13 @@ restore_selected_frame (struct frame_id a_frame_id, int frame_level) 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 @@ -969,32 +1519,64 @@ 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 (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"), + warning (_("Couldn't restore frame #%d in " + "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); } } +/* Data used by the cleanup installed by + 'make_cleanup_restore_current_thread'. */ + struct current_thread_cleanup { + /* Next in list of currently installed 'struct + current_thread_cleanup' cleanups. See + 'current_thread_cleanup_chain' below. */ + struct current_thread_cleanup *next; + ptid_t inferior_ptid; struct frame_id selected_frame_id; int selected_frame_level; int was_stopped; int inf_id; + int was_removable; }; +/* A chain of currently installed 'struct current_thread_cleanup' + cleanups. Restoring the previously selected thread looks up the + old thread in the thread list by ptid. If the thread changes ptid, + we need to update the cleanup's thread structure so the look up + succeeds. */ +static struct current_thread_cleanup *current_thread_cleanup_chain; + +/* A thread_ptid_changed observer. Update all currently installed + current_thread_cleanup cleanups that want to switch back to + OLD_PTID to switch back to NEW_PTID instead. */ + +static void +restore_current_thread_ptid_changed (ptid_t old_ptid, ptid_t new_ptid) +{ + struct current_thread_cleanup *it; + + for (it = current_thread_cleanup_chain; it != NULL; it = it->next) + { + if (ptid_equal (it->inferior_ptid, old_ptid)) + it->inferior_ptid = new_ptid; + } +} + static void do_restore_current_thread_cleanup (void *arg) { struct thread_info *tp; - struct current_thread_cleanup *old = arg; + struct current_thread_cleanup *old = (struct current_thread_cleanup *) arg; tp = find_thread_ptid (old->inferior_ptid); @@ -1003,7 +1585,7 @@ do_restore_current_thread_cleanup (void *arg) 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) + && find_inferior_ptid (tp->ptid) != NULL) restore_current_thread (old->inferior_ptid); else { @@ -1026,25 +1608,47 @@ do_restore_current_thread_cleanup (void *arg) static void restore_current_thread_cleanup_dtor (void *arg) { - struct current_thread_cleanup *old = arg; + struct current_thread_cleanup *old = (struct current_thread_cleanup *) arg; struct thread_info *tp; + struct inferior *inf; + + current_thread_cleanup_chain = current_thread_cleanup_chain->next; 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); } +/* Set the thread reference count. */ + +static void +set_thread_refcount (void *data) +{ + int k; + struct thread_array_cleanup *ta_cleanup + = (struct thread_array_cleanup *) data; + + for (k = 0; k != ta_cleanup->count; k++) + ta_cleanup->tp_array[k]->refcount--; +} + struct cleanup * make_cleanup_restore_current_thread (void) { struct thread_info *tp; struct frame_info *frame; - struct current_thread_cleanup *old; + struct current_thread_cleanup *old = XNEW (struct current_thread_cleanup); - old = xmalloc (sizeof (struct current_thread_cleanup)); old->inferior_ptid = inferior_ptid; old->inf_id = current_inferior ()->num; + old->was_removable = current_inferior ()->removable; + + old->next = current_thread_cleanup_chain; + current_thread_cleanup_chain = old; if (!ptid_equal (inferior_ptid, null_ptid)) { @@ -1053,7 +1657,14 @@ make_cleanup_restore_current_thread (void) && 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; @@ -1065,25 +1676,91 @@ make_cleanup_restore_current_thread (void) tp->refcount++; } + current_inferior ()->removable = 0; + return make_cleanup_dtor (do_restore_current_thread_cleanup, old, restore_current_thread_cleanup_dtor); } +/* 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 non-zero tp_array_compar should sort in ascending order, otherwise in + descending order. */ + +static int 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 int +tp_array_compar (const void *ap_voidp, const void *bp_voidp) +{ + const struct thread_info *a = *(const struct thread_info * const *) ap_voidp; + const struct thread_info *b = *(const struct thread_info * const *) bp_voidp; + + if (a->inf->num != b->inf->num) + { + return ((a->inf->num > b->inf->num) - (a->inf->num < b->inf->num) + * (tp_array_compar_ascending ? +1 : -1)); + } + + return (((a->per_inf_num > b->per_inf_num) + - (a->per_inf_num < b->per_inf_num)) + * (tp_array_compar_ascending ? +1 : -1)); +} + /* 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: 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 p x/i $pc Apply x/i $pc cmd to all threads. */ static void thread_apply_all_command (char *cmd, int from_tty) { - struct thread_info *tp; struct cleanup *old_chain; char *saved_cmd; + int tc; + struct thread_array_cleanup ta_cleanup; + + tp_array_compar_ascending = 0; + if (cmd != NULL + && check_for_argument (&cmd, "-ascending", strlen ("-ascending"))) + { + cmd = skip_spaces (cmd); + tp_array_compar_ascending = 1; + } if (cmd == NULL || *cmd == '\000') error (_("Please specify a command following the thread ID list")); @@ -1093,92 +1770,152 @@ thread_apply_all_command (char *cmd, int from_tty) old_chain = make_cleanup_restore_current_thread (); /* Save a copy of the command in case it is clobbered by - execute_command */ + execute_command. */ saved_cmd = xstrdup (cmd); make_cleanup (xfree, saved_cmd); - for (tp = thread_list; tp; tp = tp->next) - if (thread_alive (tp)) - { - switch_to_thread (tp->ptid); - 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 */ - } + /* Note this includes exited threads. */ + tc = thread_count (); + if (tc != 0) + { + struct thread_info **tp_array; + struct thread_info *tp; + int i = 0, k; + + /* Save a copy of the thread_list in case we execute detach + command. */ + tp_array = XNEWVEC (struct thread_info *, tc); + make_cleanup (xfree, tp_array); + + ALL_NON_EXITED_THREADS (tp) + { + tp_array[i] = tp; + tp->refcount++; + i++; + } + /* Because we skipped exited threads, we may end up with fewer + threads in the array than the total count of threads. */ + gdb_assert (i <= tc); + + if (i != 0) + qsort (tp_array, i, sizeof (*tp_array), tp_array_compar); + + ta_cleanup.tp_array = tp_array; + ta_cleanup.count = i; + make_cleanup (set_thread_refcount, &ta_cleanup); + + for (k = 0; k != i; k++) + if (thread_alive (tp_array[k])) + { + switch_to_thread (tp_array[k]->ptid); + printf_filtered (_("\nThread %s (%s):\n"), + print_thread_id (tp_array[k]), + target_pid_to_str (inferior_ptid)); + execute_command (cmd, from_tty); + + /* Restore exact command used previously. */ + strcpy (cmd, saved_cmd); + } + } do_cleanups (old_chain); } +/* Implementation of the "thread apply" command. */ + static void thread_apply_command (char *tidlist, int from_tty) { - char *cmd; - char *p; + char *cmd = NULL; struct cleanup *old_chain; char *saved_cmd; + struct tid_range_parser parser; if (tidlist == NULL || *tidlist == '\000') error (_("Please specify a thread ID list")); - for (cmd = tidlist; *cmd != '\000' && !isalpha (*cmd); cmd++); + tid_range_parser_init (&parser, tidlist, current_inferior ()->num); + while (!tid_range_parser_finished (&parser)) + { + int inf_num, thr_start, thr_end; - if (*cmd == '\000') + if (!tid_range_parser_get_tid_range (&parser, + &inf_num, &thr_start, &thr_end)) + { + cmd = (char *) tid_range_parser_string (&parser); + 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 */ + execute_command. */ saved_cmd = xstrdup (cmd); old_chain = make_cleanup (xfree, saved_cmd); - while (tidlist < cmd) - { - struct thread_info *tp; - int start, end; - start = strtol (tidlist, &p, 10); - if (p == tidlist) - error (_("Error parsing %s"), tidlist); - tidlist = p; + make_cleanup_restore_current_thread (); - while (*tidlist == ' ' || *tidlist == '\t') - tidlist++; + tid_range_parser_init (&parser, tidlist, current_inferior ()->num); + while (!tid_range_parser_finished (&parser) + && tid_range_parser_string (&parser) < cmd) + { + struct thread_info *tp = NULL; + struct inferior *inf; + int inf_num, thr_num; + + tid_range_parser_get_tid (&parser, &inf_num, &thr_num); + inf = find_inferior_id (inf_num); + if (inf != NULL) + tp = find_thread_id (inf, thr_num); - if (*tidlist == '-') /* Got a range of IDs? */ + if (tid_range_parser_star_range (&parser)) { - tidlist++; /* Skip the - */ - end = strtol (tidlist, &p, 10); - if (p == tidlist) - error (_("Error parsing %s"), tidlist); - tidlist = p; - - while (*tidlist == ' ' || *tidlist == '\t') - tidlist++; + if (inf == NULL) + { + warning (_("Unknown inferior %d"), inf_num); + tid_range_parser_skip (&parser); + continue; + } + + /* No use looking for threads past the highest thread number + the inferior ever had. */ + if (thr_num >= inf->highest_thread_num) + tid_range_parser_skip (&parser); + + /* Be quiet about unknown threads numbers. */ + if (tp == NULL) + continue; } - else - end = start; - make_cleanup_restore_current_thread (); + if (tp == NULL) + { + if (show_inferior_qualified_tids () + || tid_range_parser_qualified (&parser)) + warning (_("Unknown thread %d.%d"), inf_num, thr_num); + else + warning (_("Unknown thread %d"), thr_num); + continue; + } - for (; start <= end; start++) + if (!thread_alive (tp)) { - tp = find_thread_id (start); + warning (_("Thread %s has terminated."), print_thread_id (tp)); + continue; + } - if (!tp) - warning (_("Unknown thread %d."), start); - else if (!thread_alive (tp)) - warning (_("Thread %d has terminated."), start); - else - { - switch_to_thread (tp->ptid); + 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 %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); - } - } + /* Restore exact command used previously. */ + strcpy (cmd, saved_cmd); } do_cleanups (old_chain); @@ -1187,7 +1924,7 @@ 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) @@ -1197,13 +1934,15 @@ thread_command (char *tidstr, int from_tty) 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 @@ -1211,7 +1950,78 @@ thread_command (char *tidstr, int from_tty) return; } - gdb_thread_select (uiout, tidstr, NULL); + gdb_thread_select (current_uiout, tidstr, NULL); +} + +/* Implementation of `thread name'. */ + +static void +thread_name_command (char *arg, int from_tty) +{ + struct thread_info *info; + + if (ptid_equal (inferior_ptid, null_ptid)) + error (_("No thread selected")); + + arg = skip_spaces (arg); + + info = inferior_thread (); + xfree (info->name); + 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; + const 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 %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 %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 %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 %s has extra info '%s'\n"), + print_thread_id (tp), tmp); + match++; + } + } + if (!match) + printf_filtered (_("No threads match '%s'\n"), arg); } /* Print notices when new threads are attached and detached. */ @@ -1220,43 +2030,58 @@ static void show_print_thread_events (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) { - fprintf_filtered (file, _("\ -Printing of thread events is %s.\n"), + fprintf_filtered (file, + _("Printing of thread events is %s.\n"), 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 (ui_out_is_mi_like_p (uiout)) + { + 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, ")]"); + if (ui_out_is_mi_like_p (uiout)) + ui_out_field_int (uiout, "new-thread-id", inferior_thread ()->global_num); + else + { + ui_out_text (uiout, "[Switching to thread "); + ui_out_field_string (uiout, "new-thread-id", print_thread_id (tp)); + 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) + if (tp->state == THREAD_RUNNING) ui_out_text (uiout, "(running)\n"); else - print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC); + { + ui_out_text (uiout, "\n"); + print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1); + } /* Since the current thread may have changed, see if there is any exited thread we can now delete. */ @@ -1274,35 +2099,105 @@ 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, int_val); +} + +/* Return a new value for the selected thread's per-inferior thread + number. Return a value of 0 if no thread is selected, or no + threads exist. */ - return value_from_longest (builtin_type (gdbarch)->builtin_int, - (tp ? tp->num : 0)); +static struct value * +thread_id_per_inf_num_make_value (struct gdbarch *gdbarch, struct internalvar *var, + void *ignore) +{ + return thread_num_make_value_helper (gdbarch, 0); +} + +/* Return a new value for the selected thread's global id. Return a + value of 0 if no thread is selected, or no threads exist. */ + +static struct value * +global_thread_id_make_value (struct gdbarch *gdbarch, struct internalvar *var, + void *ignore) +{ + return thread_num_make_value_helper (gdbarch, 1); } /* Commands with a prefix of `thread'. */ struct cmd_list_element *thread_cmd_list = NULL; +/* Implementation of `thread' variable. */ + +static const struct internalvar_funcs thread_funcs = +{ + thread_id_per_inf_num_make_value, + NULL, + NULL +}; + +/* Implementation of `gthread' variable. */ + +static const struct internalvar_funcs gthread_funcs = +{ + global_thread_id_make_value, + NULL, + NULL +}; + void _initialize_thread (void) { static struct cmd_list_element *thread_apply_list = NULL; - add_info ("threads", info_threads_command, - _("IDs of currently known threads.")); + add_info ("threads", info_threads_command, + _("Display currently known threads.\n\ +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\ @@ -1314,10 +2209,27 @@ 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); - - if (!xdb_commands) - add_com_alias ("t", "thread", class_run, 1); + _("\ +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\ +Usage: thread name [NAME]\n\ +If NAME is not given, then any existing name is removed."), &thread_cmd_list); + + add_cmd ("find", class_run, thread_find_command, _("\ +Find threads that match a regular expression.\n\ +Usage: thread find REGEXP\n\ +Will display thread ids whose name, target ID, or extra info matches REGEXP."), + &thread_cmd_list); + + add_com_alias ("t", "thread", class_run, 1); add_setshow_boolean_cmd ("thread-events", no_class, &print_thread_events, _("\ @@ -1327,5 +2239,8 @@ Show printing of thread events (such as thread start and exit)."), 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); + + observer_attach_thread_ptid_changed (restore_current_thread_ptid_changed); }