X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fthread.c;h=c910dbb05f8e05d3c96cbdb72dd9b9d980e2fa54;hb=8b93c6380e299446e645ece29bf77d26f5713529;hp=23202dbcf5f40ac4f3d0d18804b891b0dd8909c1;hpb=ad3b8c4a1a37dc966ddbcc687dcf78ec1f80022f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/thread.c b/gdb/thread.c index 23202dbcf5..c910dbb05f 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -1,24 +1,25 @@ /* Multi-process/thread control for GDB, the GNU debugger. - Copyright 1986, 1987, 1988, 1993, 1998 + Copyright 1986, 1987, 1988, 1993, 1998, 1999, 2000 Contributed by Lynx Real-Time Systems, Inc. Los Gatos, CA. Free Software Foundation, Inc. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "symtab.h" @@ -34,56 +35,33 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include #include #include +#ifdef UI_OUT +#include "ui-out.h" +#endif -/*#include "lynxos-core.h"*/ - -struct thread_info -{ - struct thread_info *next; - int pid; /* Actual process id */ - int num; /* Convenient handle */ - CORE_ADDR prev_pc; /* State from wait_for_inferior */ - CORE_ADDR prev_func_start; - char *prev_func_name; - struct breakpoint *step_resume_breakpoint; - struct breakpoint *through_sigtramp_breakpoint; - CORE_ADDR step_range_start; - CORE_ADDR step_range_end; - CORE_ADDR step_frame_address; - int trap_expected; - int handling_longjmp; - int another_trap; -}; - -static struct thread_info *thread_list = NULL; -static int highest_thread_num; - -static void -thread_command PARAMS ((char * tidstr, int from_tty)); - -static void -prune_threads PARAMS ((void)); +/*#include "lynxos-core.h" */ -static void -switch_to_thread PARAMS ((int pid)); +/* Definition of struct thread_info exported to gdbthread.h */ -static struct thread_info * -find_thread_id PARAMS ((int num)); +/* Prototypes for exported functions. */ -static void -info_threads_command PARAMS ((char *, int)); +void _initialize_thread PARAMS ((void)); -static void -restore_current_thread PARAMS ((int)); +/* Prototypes for local functions. */ -static void -thread_apply_all_command PARAMS ((char *, int)); +static struct thread_info *thread_list = NULL; +static int highest_thread_num; -static void -thread_apply_command PARAMS ((char *, int)); +static struct thread_info *find_thread_id PARAMS ((int num)); -static int -thread_alive PARAMS ((struct thread_info *)); +static void thread_command PARAMS ((char *tidstr, int from_tty)); +static void thread_apply_all_command PARAMS ((char *, int)); +static int thread_alive PARAMS ((struct thread_info *)); +static void info_threads_command PARAMS ((char *, int)); +static void thread_apply_command PARAMS ((char *, int)); +static void restore_current_thread PARAMS ((int)); +static void switch_to_thread PARAMS ((int pid)); +static void prune_threads PARAMS ((void)); void init_thread_list () @@ -103,7 +81,10 @@ init_thread_list () highest_thread_num = 0; } -void +/* add_thread now returns a pointer to the new thread_info, + so that back_ends can initialize their private data. */ + +struct thread_info * add_thread (pid) int pid; { @@ -118,14 +99,19 @@ add_thread (pid) tp->prev_func_name = NULL; tp->step_range_start = 0; tp->step_range_end = 0; - tp->step_frame_address =0; + tp->step_frame_address = 0; tp->step_resume_breakpoint = 0; tp->through_sigtramp_breakpoint = 0; tp->handling_longjmp = 0; tp->trap_expected = 0; tp->another_trap = 0; + tp->stepping_through_solib_after_catch = 0; + tp->stepping_through_solib_catchpoints = NULL; + tp->stepping_through_sigtramp = 0; tp->next = thread_list; + tp->private = NULL; thread_list = tp; + return tp; } void @@ -148,6 +134,16 @@ delete_thread (pid) else thread_list = tp->next; + /* NOTE: this will take care of any left-over step_resume breakpoints, + but not any user-specified thread-specific breakpoints. */ + if (tp->step_resume_breakpoint) + delete_breakpoint (tp->step_resume_breakpoint); + + /* FIXME: do I ever need to call the back-end to give it a + chance at this private data before deleting the thread? */ + if (tp->private) + free (tp->private); + free (tp); return; @@ -155,7 +151,7 @@ delete_thread (pid) static struct thread_info * find_thread_id (num) - int num; + int num; { struct thread_info *tp; @@ -166,9 +162,51 @@ find_thread_id (num) return NULL; } +/* Find a thread_info by matching 'pid'. */ +struct thread_info * +find_thread_pid (pid) + int pid; +{ + struct thread_info *tp; + + for (tp = thread_list; tp; tp = tp->next) + if (tp->pid == pid) + return tp; + + return NULL; +} + +/* + * Thread iterator function. + * + * 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 + * search for a thread with arbitrary attributes, or for applying + * some operation to every thread. + * + * FIXME: some of the existing functionality, such as + * "Thread apply all", might be rewritten using this functionality. + */ + +struct thread_info * +iterate_over_threads (callback, data) + int (*callback) (); + void *data; +{ + struct thread_info *tp; + + for (tp = thread_list; tp; tp = tp->next) + if ((*callback) (tp, data)) + return tp; + + return NULL; +} + int valid_thread_id (num) - int num; + int num; { struct thread_info *tp; @@ -181,7 +219,7 @@ valid_thread_id (num) int pid_to_thread_id (pid) - int pid; + int pid; { struct thread_info *tp; @@ -194,7 +232,7 @@ pid_to_thread_id (pid) int thread_id_to_pid (num) - int num; + int num; { struct thread_info *thread = find_thread_id (num); if (thread) @@ -205,7 +243,7 @@ thread_id_to_pid (num) int in_thread_list (pid) - int pid; + int pid; { struct thread_info *tp; @@ -215,14 +253,49 @@ in_thread_list (pid) return 0; /* Never heard of 'im */ } +#ifdef UI_OUT +/* Print a list of thread ids currently known, and the total number of + threads. To be used from within catch_errors. */ +static int +do_captured_list_thread_ids (void *arg) +{ + struct thread_info *tp; + int num = 0; + + ui_out_list_begin (uiout, "thread-ids"); + + for (tp = thread_list; tp; tp = tp->next) + { + num++; + ui_out_field_int (uiout, "thread-id", tp->num); + } + + ui_out_list_end (uiout); + ui_out_field_int (uiout, "number-of-threads", num); + return GDB_RC_OK; +} + +/* Official gdblib interface function to get a list of thread ids and + the total number. */ +enum gdb_rc +gdb_list_thread_ids (/* output object */) +{ + return catch_errors (do_captured_list_thread_ids, NULL, + NULL, RETURN_MASK_ALL); +} +#endif /* Load infrun state for the thread PID. */ -void load_infrun_state (pid, prev_pc, prev_func_start, prev_func_name, - trap_expected, step_resume_breakpoint, - through_sigtramp_breakpoint, step_range_start, - step_range_end, step_frame_address, - handling_longjmp, another_trap) +void +load_infrun_state (pid, prev_pc, prev_func_start, prev_func_name, + trap_expected, step_resume_breakpoint, + through_sigtramp_breakpoint, step_range_start, + step_range_end, step_frame_address, + handling_longjmp, another_trap, + stepping_through_solib_after_catch, + stepping_through_solib_catchpoints, + stepping_through_sigtramp) int pid; CORE_ADDR *prev_pc; CORE_ADDR *prev_func_start; @@ -235,6 +308,9 @@ void load_infrun_state (pid, prev_pc, prev_func_start, prev_func_name, CORE_ADDR *step_frame_address; int *handling_longjmp; int *another_trap; + int *stepping_through_solib_after_catch; + bpstat *stepping_through_solib_catchpoints; + int *stepping_through_sigtramp; { struct thread_info *tp; @@ -255,15 +331,22 @@ void load_infrun_state (pid, prev_pc, prev_func_start, prev_func_name, *handling_longjmp = tp->handling_longjmp; *trap_expected = tp->trap_expected; *another_trap = tp->another_trap; + *stepping_through_solib_after_catch = tp->stepping_through_solib_after_catch; + *stepping_through_solib_catchpoints = tp->stepping_through_solib_catchpoints; + *stepping_through_sigtramp = tp->stepping_through_sigtramp; } /* Save infrun state for the thread PID. */ -void save_infrun_state (pid, prev_pc, prev_func_start, prev_func_name, - trap_expected, step_resume_breakpoint, - through_sigtramp_breakpoint, step_range_start, - step_range_end, step_frame_address, - handling_longjmp, another_trap) +void +save_infrun_state (pid, prev_pc, prev_func_start, prev_func_name, + trap_expected, step_resume_breakpoint, + through_sigtramp_breakpoint, step_range_start, + step_range_end, step_frame_address, + handling_longjmp, another_trap, + stepping_through_solib_after_catch, + stepping_through_solib_catchpoints, + stepping_through_sigtramp) int pid; CORE_ADDR prev_pc; CORE_ADDR prev_func_start; @@ -276,6 +359,9 @@ void save_infrun_state (pid, prev_pc, prev_func_start, prev_func_name, CORE_ADDR step_frame_address; int handling_longjmp; int another_trap; + int stepping_through_solib_after_catch; + bpstat stepping_through_solib_catchpoints; + int stepping_through_sigtramp; { struct thread_info *tp; @@ -296,6 +382,9 @@ void save_infrun_state (pid, prev_pc, prev_func_start, prev_func_name, tp->handling_longjmp = handling_longjmp; tp->trap_expected = trap_expected; tp->another_trap = another_trap; + tp->stepping_through_solib_after_catch = stepping_through_solib_after_catch; + tp->stepping_through_solib_catchpoints = stepping_through_solib_catchpoints; + tp->stepping_through_sigtramp = stepping_through_sigtramp; } /* Return true if TP is an active thread. */ @@ -305,9 +394,9 @@ thread_alive (tp) { if (tp->pid == -1) return 0; - if (! target_thread_alive (tp->pid)) + if (!target_thread_alive (tp->pid)) { - tp->pid = -1; /* Mark it as dead */ + tp->pid = -1; /* Mark it as dead */ return 0; } return 1; @@ -316,26 +405,22 @@ thread_alive (tp) static void prune_threads () { - struct thread_info *tp, *tpprev, *next; + struct thread_info *tp, *next; - tpprev = 0; for (tp = thread_list; tp; tp = next) { next = tp->next; if (!thread_alive (tp)) - { - if (tpprev) - tpprev->next = next; - else - thread_list = next; - free (tp); - } - else - tpprev = tp; + delete_thread (tp->pid); } } -/* Print information about currently known threads */ +/* Print information about currently known threads + + * Note: this has the drawback that it _really_ switches + * threads, which frees the frame cache. A no-side + * effects info-threads command would be nicer. + */ static void info_threads_command (arg, from_tty) @@ -343,17 +428,20 @@ info_threads_command (arg, from_tty) int from_tty; { struct thread_info *tp; - int current_pid = inferior_pid; + int current_pid; + struct frame_info *cur_frame; + int saved_frame_level = selected_frame_level; + int counter; + char *extra_info; /* Avoid coredumps which would happen if we tried to access a NULL selected_frame. */ - if (!target_has_stack) error ("No stack."); + if (!target_has_stack) + error ("No stack."); prune_threads (); -#if defined(FIND_NEW_THREADS) - FIND_NEW_THREADS (); -#endif - + target_find_new_threads (); + current_pid = inferior_pid; for (tp = thread_list; tp; tp = tp->next) { if (tp->pid == current_pid) @@ -361,16 +449,47 @@ info_threads_command (arg, from_tty) else printf_filtered (" "); - printf_filtered ("%d %s ", tp->num, target_pid_to_str (tp->pid)); +#ifdef HPUXHPPA + printf_filtered ("%d %s", tp->num, target_tid_to_str (tp->pid)); +#else + printf_filtered ("%d %s", tp->num, target_pid_to_str (tp->pid)); +#endif + + extra_info = target_extra_thread_info (tp); + if (extra_info) + printf_filtered (" (%s)", extra_info); + puts_filtered (" "); switch_to_thread (tp->pid); if (selected_frame) - print_stack_frame (selected_frame, -1, 0); + print_only_stack_frame (selected_frame, -1, 0); else printf_filtered ("[No stack.]\n"); } switch_to_thread (current_pid); + + /* Code below copied from "up_silently_base" in "stack.c". + * It restores the frame set by the user before the "info threads" + * command. We have finished the info-threads display by switching + * back to the current thread. That switch has put us at the top + * of the stack (leaf frame). + */ + counter = saved_frame_level; + cur_frame = find_relative_frame (selected_frame, &counter); + if (counter != 0) + { + /* Ooops, can't restore, tell user where we are. */ + warning ("Couldn't restore frame in current thread, at frame 0"); + print_stack_frame (selected_frame, -1, 0); + } + else + { + select_frame (cur_frame, saved_frame_level); + } + + /* re-show current frame. */ + show_stack_frame (cur_frame); } /* Switch from one thread to another. */ @@ -385,7 +504,7 @@ switch_to_thread (pid) inferior_pid = pid; flush_cached_frames (); registers_changed (); - stop_pc = read_pc(); + stop_pc = read_pc (); select_frame (get_current_frame (), 0); } @@ -394,17 +513,20 @@ restore_current_thread (pid) int pid; { if (pid != inferior_pid) - switch_to_thread (pid); + { + switch_to_thread (pid); + print_stack_frame (get_current_frame (), 0, -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 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 + */ static void thread_apply_all_command (cmd, from_tty) @@ -417,15 +539,21 @@ thread_apply_all_command (cmd, from_tty) if (cmd == NULL || *cmd == '\000') error ("Please specify a command following the thread ID list"); - old_chain = make_cleanup ((make_cleanup_func) restore_current_thread, - (void *) inferior_pid); + old_chain = make_cleanup ((make_cleanup_func) restore_current_thread, + (void *) inferior_pid); for (tp = thread_list; tp; tp = tp->next) if (thread_alive (tp)) { switch_to_thread (tp->pid); +#ifdef HPUXHPPA + printf_filtered ("\nThread %d (%s):\n", + tp->num, + target_tid_to_str (inferior_pid)); +#else printf_filtered ("\nThread %d (%s):\n", tp->num, target_pid_to_str (inferior_pid)); +#endif execute_command (cmd, from_tty); } } @@ -442,13 +570,13 @@ thread_apply_command (tidlist, from_tty) if (tidlist == NULL || *tidlist == '\000') error ("Please specify a thread ID list"); - for (cmd = tidlist; *cmd != '\000' && !isalpha(*cmd); cmd++); + for (cmd = tidlist; *cmd != '\000' && !isalpha (*cmd); cmd++); if (*cmd == '\000') error ("Please specify a command following the thread ID list"); - old_chain = make_cleanup ((make_cleanup_func) restore_current_thread, - (void *) inferior_pid); + old_chain = make_cleanup ((make_cleanup_func) restore_current_thread, + (void *) inferior_pid); while (tidlist < cmd) { @@ -465,7 +593,7 @@ thread_apply_command (tidlist, from_tty) if (*tidlist == '-') /* Got a range of IDs? */ { - tidlist++; /* Skip the - */ + tidlist++; /* Skip the - */ end = strtol (tidlist, &p, 10); if (p == tidlist) error ("Error parsing %s", tidlist); @@ -488,8 +616,13 @@ thread_apply_command (tidlist, from_tty) else { switch_to_thread (tp->pid); +#ifdef HPUXHPPA + printf_filtered ("\nThread %d (%s):\n", tp->num, + target_tid_to_str (inferior_pid)); +#else printf_filtered ("\nThread %d (%s):\n", tp->num, target_pid_to_str (inferior_pid)); +#endif execute_command (cmd, from_tty); } } @@ -503,30 +636,81 @@ static void thread_command (tidstr, from_tty) char *tidstr; int from_tty; +{ + if (!tidstr) + { + /* Don't generate an error, just say which thread is current. */ + if (target_has_stack) + printf_filtered ("[Current thread is %d (%s)]\n", + pid_to_thread_id (inferior_pid), +#if defined(HPUXHPPA) + target_tid_to_str (inferior_pid) +#else + target_pid_to_str (inferior_pid) +#endif + ); + else + error ("No stack."); + return; + } + + gdb_thread_select (tidstr); +} + +static int +do_captured_thread_select (void *tidstr) { int num; struct thread_info *tp; - if (!tidstr) - error ("Please specify a thread ID. Use the \"info threads\" command to\n\ -see the IDs of currently known threads."); - - num = atoi (tidstr); + num = atoi ((char *)tidstr); tp = find_thread_id (num); +#ifdef UI_OUT + if (!tp) + error ("Thread ID %d not known.", num); +#else if (!tp) error ("Thread ID %d not known. Use the \"info threads\" command to\n\ see the IDs of currently known threads.", num); +#endif if (!thread_alive (tp)) error ("Thread ID %d has terminated.\n", num); switch_to_thread (tp->pid); - if (context_hook) - context_hook (num); - printf_filtered ("[Switching to %s]\n", target_pid_to_str (inferior_pid)); + +#ifdef UI_OUT + ui_out_text (uiout, "[Switching to thread "); + ui_out_field_int (uiout, "new-thread-id", pid_to_thread_id (inferior_pid)); + ui_out_text (uiout, " ("); +#if defined(HPUXHPPA) + ui_out_text (uiout, target_tid_to_str (inferior_pid)); +#else + ui_out_text (uiout, target_pid_to_str (inferior_pid)); +#endif + ui_out_text (uiout, ")]"); +#else /* UI_OUT */ + printf_filtered ("[Switching to thread %d (%s)]\n", + pid_to_thread_id (inferior_pid), +#if defined(HPUXHPPA) + target_tid_to_str (inferior_pid) +#else + target_pid_to_str (inferior_pid) +#endif + ); +#endif /* UI_OUT */ + print_stack_frame (selected_frame, selected_frame_level, 1); + return GDB_RC_OK; +} + +enum gdb_rc +gdb_thread_select (char *tidstr) +{ + return catch_errors (do_captured_thread_select, tidstr, + NULL, RETURN_MASK_ALL); } /* Commands with a prefix of `thread'. */ @@ -536,7 +720,6 @@ void _initialize_thread () { static struct cmd_list_element *thread_apply_list = NULL; - extern struct cmd_list_element *cmdlist; add_info ("threads", info_threads_command, "IDs of currently known threads."); @@ -554,5 +737,6 @@ The new thread ID must be currently known.", &thread_cmd_list, "thread ", 1, "Apply a command to all threads.", &thread_apply_list); - add_com_alias ("t", "thread", class_run, 1); + if (!xdb_commands) + add_com_alias ("t", "thread", class_run, 1); }