/* Multi-process/thread control for GDB, the GNU debugger.
- Copyright 1986, 1987, 1988, 1993, 1998, 1999, 2000
+
+ Copyright (C) 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ 2000, 2001, 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
Contributed by Lynx Real-Time Systems, Inc. Los Gatos, CA.
- Free Software Foundation, Inc.
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
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
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. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "symtab.h"
#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 <ctype.h>
#include <sys/types.h>
#include <signal.h>
-#ifdef UI_OUT
#include "ui-out.h"
-#endif
-
-/*#include "lynxos-core.h" */
+#include "observer.h"
/* Definition of struct thread_info exported to gdbthread.h */
/* Prototypes for exported functions. */
-void _initialize_thread PARAMS ((void));
+void _initialize_thread (void);
/* Prototypes for local functions. */
static struct thread_info *thread_list = NULL;
static int highest_thread_num;
-static struct thread_info *find_thread_id PARAMS ((int num));
+static struct thread_info *find_thread_id (int num);
-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));
+static void thread_command (char *tidstr, int from_tty);
+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);
void
-init_thread_list ()
+delete_step_resume_breakpoint (void *arg)
+{
+ struct breakpoint **breakpointp = (struct breakpoint **) arg;
+ struct thread_info *tp;
+
+ if (*breakpointp != NULL)
+ {
+ delete_breakpoint (*breakpointp);
+ for (tp = thread_list; tp; tp = tp->next)
+ if (tp->step_resume_breakpoint == *breakpointp)
+ tp->step_resume_breakpoint = NULL;
+
+ *breakpointp = NULL;
+ }
+}
+
+static void
+free_thread (struct thread_info *tp)
+{
+ /* NOTE: this will take care of any left-over step_resume breakpoints,
+ 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->step_resume_breakpoint)
+ tp->step_resume_breakpoint->disposition = disp_del_at_next_stop;
+
+ /* 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)
+ xfree (tp->private);
+
+ xfree (tp);
+}
+
+void
+init_thread_list (void)
{
struct thread_info *tp, *tpnext;
+ highest_thread_num = 0;
if (!thread_list)
return;
for (tp = thread_list; tp; tp = tpnext)
{
tpnext = tp->next;
- free (tp);
+ free_thread (tp);
}
thread_list = NULL;
- highest_thread_num = 0;
}
-/* 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;
+add_thread_silent (ptid_t ptid)
{
struct thread_info *tp;
- tp = (struct thread_info *) xmalloc (sizeof (struct thread_info));
-
- tp->pid = pid;
+ tp = (struct thread_info *) xmalloc (sizeof (*tp));
+ memset (tp, 0, sizeof (*tp));
+ tp->ptid = ptid;
tp->num = ++highest_thread_num;
- tp->prev_pc = 0;
- tp->prev_func_start = 0;
- tp->prev_func_name = NULL;
- tp->step_range_start = 0;
- tp->step_range_end = 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;
+
+ observer_notify_new_thread (tp);
+
return tp;
}
+struct thread_info *
+add_thread_with_info (ptid_t ptid, struct private_thread_info *private)
+{
+ struct thread_info *result = add_thread_silent (ptid);
+
+ result->private = private;
+
+ if (print_thread_events)
+ printf_unfiltered (_("[New %s]\n"), target_pid_to_str (ptid));
+
+ return result;
+}
+
+struct thread_info *
+add_thread (ptid_t ptid)
+{
+ return add_thread_with_info (ptid, NULL);
+}
+
void
-delete_thread (pid)
- int pid;
+delete_thread (ptid_t ptid)
{
struct thread_info *tp, *tpprev;
tpprev = NULL;
for (tp = thread_list; tp; tpprev = tp, tp = tp->next)
- if (tp->pid == pid)
+ if (ptid_equal (tp->ptid, ptid))
break;
if (!tp)
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);
+ observer_notify_thread_exit (tp);
- return;
+ free_thread (tp);
}
static struct thread_info *
-find_thread_id (num)
- int num;
+find_thread_id (int num)
{
struct thread_info *tp;
return NULL;
}
-/* Find a thread_info by matching 'pid'. */
+/* Find a thread_info by matching PTID. */
struct thread_info *
-find_thread_pid (pid)
- int pid;
+find_thread_pid (ptid_t ptid)
{
struct thread_info *tp;
for (tp = thread_list; tp; tp = tp->next)
- if (tp->pid == pid)
+ if (ptid_equal (tp->ptid, ptid))
return tp;
return NULL;
*/
struct thread_info *
-iterate_over_threads (callback, data)
- int (*callback) ();
- void *data;
+iterate_over_threads (int (*callback) (struct thread_info *, void *),
+ void *data)
{
struct thread_info *tp;
}
int
-valid_thread_id (num)
- int num;
+valid_thread_id (int num)
{
struct thread_info *tp;
}
int
-pid_to_thread_id (pid)
- int pid;
+pid_to_thread_id (ptid_t ptid)
{
struct thread_info *tp;
for (tp = thread_list; tp; tp = tp->next)
- if (tp->pid == pid)
+ if (ptid_equal (tp->ptid, ptid))
return tp->num;
return 0;
}
-int
-thread_id_to_pid (num)
- int num;
+ptid_t
+thread_id_to_pid (int num)
{
struct thread_info *thread = find_thread_id (num);
if (thread)
- return thread->pid;
+ return thread->ptid;
else
- return -1;
+ return pid_to_ptid (-1);
}
int
-in_thread_list (pid)
- int pid;
+in_thread_list (ptid_t ptid)
{
struct thread_info *tp;
for (tp = thread_list; tp; tp = tp->next)
- if (tp->pid == pid)
+ if (ptid_equal (tp->ptid, ptid))
return 1;
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)
+static int
+do_captured_list_thread_ids (struct ui_out *uiout, void *arg)
{
struct thread_info *tp;
int num = 0;
+ struct cleanup *cleanup_chain;
+
+ prune_threads ();
+ target_find_new_threads ();
- ui_out_list_begin (uiout, "thread-ids");
+ cleanup_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "thread-ids");
for (tp = thread_list; tp; tp = tp->next)
{
ui_out_field_int (uiout, "thread-id", tp->num);
}
- ui_out_list_end (uiout);
+ do_cleanups (cleanup_chain);
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 */)
+gdb_list_thread_ids (struct ui_out *uiout, char **error_message)
{
- return catch_errors (do_captured_list_thread_ids, NULL,
- NULL, RETURN_MASK_ALL);
+ if (catch_exceptions_with_msg (uiout, do_captured_list_thread_ids, NULL,
+ error_message, RETURN_MASK_ALL) < 0)
+ return GDB_RC_FAIL;
+ return GDB_RC_OK;
}
-#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,
- stepping_through_solib_after_catch,
- stepping_through_solib_catchpoints,
- stepping_through_sigtramp)
- int pid;
- CORE_ADDR *prev_pc;
- CORE_ADDR *prev_func_start;
- char **prev_func_name;
- int *trap_expected;
- 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 *handling_longjmp;
- int *another_trap;
- int *stepping_through_solib_after_catch;
- bpstat *stepping_through_solib_catchpoints;
- int *stepping_through_sigtramp;
+load_infrun_state (ptid_t ptid,
+ CORE_ADDR *prev_pc,
+ int *trap_expected,
+ struct breakpoint **step_resume_breakpoint,
+ CORE_ADDR *step_range_start,
+ CORE_ADDR *step_range_end,
+ struct frame_id *step_frame_id,
+ int *stepping_over_breakpoint,
+ int *stepping_through_solib_after_catch,
+ bpstat *stepping_through_solib_catchpoints,
+ int *current_line,
+ struct symtab **current_symtab)
{
struct thread_info *tp;
/* If we can't find the thread, then we're debugging a single threaded
process. No need to do anything in that case. */
- tp = find_thread_id (pid_to_thread_id (pid));
+ tp = find_thread_id (pid_to_thread_id (ptid));
if (tp == NULL)
return;
*prev_pc = tp->prev_pc;
- *prev_func_start = tp->prev_func_start;
- *prev_func_name = tp->prev_func_name;
+ *trap_expected = tp->trap_expected;
*step_resume_breakpoint = tp->step_resume_breakpoint;
*step_range_start = tp->step_range_start;
*step_range_end = tp->step_range_end;
- *step_frame_address = tp->step_frame_address;
- *through_sigtramp_breakpoint = tp->through_sigtramp_breakpoint;
- *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;
+ *step_frame_id = tp->step_frame_id;
+ *stepping_over_breakpoint = tp->stepping_over_breakpoint;
+ *stepping_through_solib_after_catch =
+ tp->stepping_through_solib_after_catch;
+ *stepping_through_solib_catchpoints =
+ tp->stepping_through_solib_catchpoints;
+ *current_line = tp->current_line;
+ *current_symtab = tp->current_symtab;
}
/* 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,
- stepping_through_solib_after_catch,
- stepping_through_solib_catchpoints,
- stepping_through_sigtramp)
- int pid;
- CORE_ADDR prev_pc;
- CORE_ADDR prev_func_start;
- char *prev_func_name;
- int trap_expected;
- 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 handling_longjmp;
- int another_trap;
- int stepping_through_solib_after_catch;
- bpstat stepping_through_solib_catchpoints;
- int stepping_through_sigtramp;
+save_infrun_state (ptid_t ptid,
+ CORE_ADDR prev_pc,
+ int trap_expected,
+ struct breakpoint *step_resume_breakpoint,
+ CORE_ADDR step_range_start,
+ CORE_ADDR step_range_end,
+ const struct frame_id *step_frame_id,
+ int stepping_over_breakpoint,
+ int stepping_through_solib_after_catch,
+ bpstat stepping_through_solib_catchpoints,
+ int current_line,
+ struct symtab *current_symtab)
{
struct thread_info *tp;
/* If we can't find the thread, then we're debugging a single-threaded
process. Nothing to do in that case. */
- tp = find_thread_id (pid_to_thread_id (pid));
+ tp = find_thread_id (pid_to_thread_id (ptid));
if (tp == NULL)
return;
tp->prev_pc = prev_pc;
- tp->prev_func_start = prev_func_start;
- tp->prev_func_name = prev_func_name;
+ tp->trap_expected = trap_expected;
tp->step_resume_breakpoint = step_resume_breakpoint;
tp->step_range_start = step_range_start;
tp->step_range_end = step_range_end;
- tp->step_frame_address = step_frame_address;
- tp->through_sigtramp_breakpoint = through_sigtramp_breakpoint;
- tp->handling_longjmp = handling_longjmp;
- tp->trap_expected = trap_expected;
- tp->another_trap = another_trap;
+ tp->step_frame_id = (*step_frame_id);
+ tp->stepping_over_breakpoint = stepping_over_breakpoint;
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;
+ tp->current_line = current_line;
+ tp->current_symtab = current_symtab;
}
/* Return true if TP is an active thread. */
static int
-thread_alive (tp)
- struct thread_info *tp;
+thread_alive (struct thread_info *tp)
{
- if (tp->pid == -1)
+ if (PIDGET (tp->ptid) == -1)
return 0;
- if (!target_thread_alive (tp->pid))
+ if (!target_thread_alive (tp->ptid))
{
- tp->pid = -1; /* Mark it as dead */
+ tp->ptid = pid_to_ptid (-1); /* Mark it as dead */
return 0;
}
return 1;
}
static void
-prune_threads ()
+prune_threads (void)
{
struct thread_info *tp, *next;
{
next = tp->next;
if (!thread_alive (tp))
- delete_thread (tp->pid);
+ delete_thread (tp->ptid);
}
}
-/* 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)
- char *arg;
- int from_tty;
+/* Prints the list of threads and their details on UIOUT.
+ This is a version of 'info_thread_command' suitable for
+ use from MI.
+ If REQESTED_THREAD is not -1, it's the GDB id of the thread
+ that should be printed. Otherwise, all threads are
+ printed. */
+void
+print_thread_info (struct ui_out *uiout, int requested_thread)
{
struct thread_info *tp;
- int current_pid;
+ ptid_t current_ptid;
struct frame_info *cur_frame;
- int saved_frame_level = selected_frame_level;
- int counter;
+ struct cleanup *old_chain;
+ struct frame_id saved_frame_id;
char *extra_info;
+ int current_thread = -1;
- /* Avoid coredumps which would happen if we tried to access a NULL
- selected_frame. */
- if (!target_has_stack)
- error ("No stack.");
+ /* Backup current thread and selected frame. */
+ saved_frame_id = get_frame_id (get_selected_frame (NULL));
+ old_chain = make_cleanup_restore_current_thread (inferior_ptid, saved_frame_id);
+
+ make_cleanup_ui_out_list_begin_end (uiout, "threads");
prune_threads ();
target_find_new_threads ();
- current_pid = inferior_pid;
+ current_ptid = inferior_ptid;
for (tp = thread_list; tp; tp = tp->next)
{
- if (tp->pid == current_pid)
- printf_filtered ("* ");
+ struct cleanup *chain2;
+
+ if (requested_thread != -1 && tp->num != requested_thread)
+ continue;
+
+ chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
+
+ if (ptid_equal (tp->ptid, current_ptid))
+ {
+ current_thread = tp->num;
+ ui_out_text (uiout, "* ");
+ }
else
- printf_filtered (" ");
+ ui_out_text (uiout, " ");
-#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
+ ui_out_field_int (uiout, "id", tp->num);
+ ui_out_text (uiout, " ");
+ ui_out_field_string (uiout, "target-id", target_tid_to_str (tp->ptid));
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_only_stack_frame (selected_frame, -1, 0);
- else
- printf_filtered ("[No stack.]\n");
+ {
+ ui_out_text (uiout, " (");
+ ui_out_field_string (uiout, "details", extra_info);
+ ui_out_text (uiout, ")");
+ }
+ ui_out_text (uiout, " ");
+ /* That switch put 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);
+
+ do_cleanups (chain2);
}
- 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)
+ /* Restores the current thread and the frame selected before
+ the "info threads" command. */
+ do_cleanups (old_chain);
+
+ if (requested_thread == -1)
{
- /* 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);
+ gdb_assert (current_thread != -1 || !thread_list);
+ if (current_thread != -1 && ui_out_is_mi_like_p (uiout))
+ ui_out_field_int (uiout, "current-thread-id", current_thread);
}
- else
+
+ /* If case we were not able to find the original frame, print the
+ new selected frame. */
+ if (frame_find_by_id (saved_frame_id) == NULL)
{
- select_frame (cur_frame, saved_frame_level);
+ warning (_("Couldn't restore frame in current thread, at frame 0"));
+ /* 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. */
+ if (!ui_out_is_mi_like_p (uiout))
+ print_stack_frame (get_selected_frame (NULL), 0, LOCATION);
}
+}
+
+
+/* Print information about currently known threads
- /* re-show current frame. */
- show_stack_frame (cur_frame);
+ * 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);
}
/* Switch from one thread to another. */
-static void
-switch_to_thread (pid)
- int pid;
+void
+switch_to_thread (ptid_t ptid)
{
- if (pid == inferior_pid)
+ if (ptid_equal (ptid, inferior_ptid))
return;
- inferior_pid = pid;
- flush_cached_frames ();
+ inferior_ptid = ptid;
+ reinit_frame_cache ();
registers_changed ();
stop_pc = read_pc ();
- select_frame (get_current_frame (), 0);
}
static void
-restore_current_thread (pid)
- int pid;
+restore_current_thread (ptid_t ptid)
+{
+ if (!ptid_equal (ptid, inferior_ptid))
+ {
+ switch_to_thread (ptid);
+ }
+}
+
+static void
+restore_selected_frame (struct frame_id a_frame_id)
{
- if (pid != inferior_pid)
+ struct frame_info *selected_frame_info = NULL;
+
+ if (frame_id_eq (a_frame_id, null_frame_id))
+ return;
+
+ if ((selected_frame_info = frame_find_by_id (a_frame_id)) != NULL)
{
- switch_to_thread (pid);
- print_stack_frame (get_current_frame (), 0, -1);
+ select_frame (selected_frame_info);
}
}
+struct current_thread_cleanup
+{
+ ptid_t inferior_ptid;
+ struct frame_id selected_frame_id;
+};
+
+static void
+do_restore_current_thread_cleanup (void *arg)
+{
+ struct current_thread_cleanup *old = arg;
+ restore_current_thread (old->inferior_ptid);
+ restore_selected_frame (old->selected_frame_id);
+ xfree (old);
+}
+
+struct cleanup *
+make_cleanup_restore_current_thread (ptid_t inferior_ptid,
+ struct frame_id a_frame_id)
+{
+ struct current_thread_cleanup *old
+ = xmalloc (sizeof (struct current_thread_cleanup));
+ old->inferior_ptid = inferior_ptid;
+ old->selected_frame_id = a_frame_id;
+ return make_cleanup (do_restore_current_thread_cleanup, old);
+}
+
/* 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:
*/
static void
-thread_apply_all_command (cmd, from_tty)
- char *cmd;
- int from_tty;
+thread_apply_all_command (char *cmd, int from_tty)
{
struct thread_info *tp;
struct cleanup *old_chain;
+ struct cleanup *saved_cmd_cleanup_chain;
+ char *saved_cmd;
+ struct frame_id saved_frame_id;
+ ptid_t current_ptid;
+ int thread_has_changed = 0;
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);
+ error (_("Please specify a command following the thread ID list"));
+
+ current_ptid = inferior_ptid;
+ saved_frame_id = get_frame_id (get_selected_frame (NULL));
+ old_chain = make_cleanup_restore_current_thread (inferior_ptid, saved_frame_id);
+
+ /* It is safe to update the thread list now, before
+ traversing it for "thread apply all". MVS */
+ target_find_new_threads ();
+ /* Save a copy of the command in case it is clobbered by
+ execute_command */
+ saved_cmd = xstrdup (cmd);
+ saved_cmd_cleanup_chain = make_cleanup (xfree, (void *) saved_cmd);
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
+ switch_to_thread (tp->ptid);
+ printf_filtered (_("\nThread %d (%s):\n"),
+ tp->num, target_tid_to_str (inferior_ptid));
execute_command (cmd, from_tty);
+ strcpy (cmd, saved_cmd); /* Restore exact command used previously */
}
+
+ if (!ptid_equal (current_ptid, inferior_ptid))
+ thread_has_changed = 1;
+
+ do_cleanups (saved_cmd_cleanup_chain);
+ do_cleanups (old_chain);
+ /* Print stack frame only if we changed thread. */
+ if (thread_has_changed)
+ print_stack_frame (get_current_frame (), 1, SRC_LINE);
+
}
static void
-thread_apply_command (tidlist, from_tty)
- char *tidlist;
- int from_tty;
+thread_apply_command (char *tidlist, int from_tty)
{
char *cmd;
char *p;
struct cleanup *old_chain;
+ struct cleanup *saved_cmd_cleanup_chain;
+ char *saved_cmd;
+ struct frame_id saved_frame_id;
+ ptid_t current_ptid;
+ int thread_has_changed = 0;
if (tidlist == NULL || *tidlist == '\000')
- error ("Please specify a thread ID list");
+ error (_("Please specify a thread ID list"));
for (cmd = tidlist; *cmd != '\000' && !isalpha (*cmd); cmd++);
if (*cmd == '\000')
- error ("Please specify a command following the thread ID list");
+ error (_("Please specify a command following the thread ID list"));
- old_chain = make_cleanup ((make_cleanup_func) restore_current_thread,
- (void *) inferior_pid);
+ current_ptid = inferior_ptid;
+ saved_frame_id = get_frame_id (get_selected_frame (NULL));
+ old_chain = make_cleanup_restore_current_thread (inferior_ptid, saved_frame_id);
+ /* Save a copy of the command in case it is clobbered by
+ execute_command */
+ saved_cmd = xstrdup (cmd);
+ saved_cmd_cleanup_chain = make_cleanup (xfree, (void *) saved_cmd);
while (tidlist < cmd)
{
struct thread_info *tp;
start = strtol (tidlist, &p, 10);
if (p == tidlist)
- error ("Error parsing %s", tidlist);
+ error (_("Error parsing %s"), tidlist);
tidlist = p;
while (*tidlist == ' ' || *tidlist == '\t')
tidlist++; /* Skip the - */
end = strtol (tidlist, &p, 10);
if (p == tidlist)
- error ("Error parsing %s", tidlist);
+ error (_("Error parsing %s"), tidlist);
tidlist = p;
while (*tidlist == ' ' || *tidlist == '\t')
tp = find_thread_id (start);
if (!tp)
- warning ("Unknown thread %d.", start);
+ warning (_("Unknown thread %d."), start);
else if (!thread_alive (tp))
- warning ("Thread %d has terminated.", start);
+ warning (_("Thread %d has terminated."), start);
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
+ switch_to_thread (tp->ptid);
+ printf_filtered (_("\nThread %d (%s):\n"), tp->num,
+ target_tid_to_str (inferior_ptid));
execute_command (cmd, from_tty);
+ strcpy (cmd, saved_cmd); /* Restore exact command used previously */
}
}
}
+
+ if (!ptid_equal (current_ptid, inferior_ptid))
+ thread_has_changed = 1;
+
+ do_cleanups (saved_cmd_cleanup_chain);
+ do_cleanups (old_chain);
+ /* Print stack frame only if we changed thread. */
+ if (thread_has_changed)
+ print_stack_frame (get_current_frame (), 1, SRC_LINE);
}
/* Switch to the specified thread. Will dispatch off to thread_apply_command
if prefix of arg is `apply'. */
static void
-thread_command (tidstr, from_tty)
- char *tidstr;
- int from_tty;
+thread_command (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
- );
+ printf_filtered (_("[Current thread is %d (%s)]\n"),
+ pid_to_thread_id (inferior_ptid),
+ target_tid_to_str (inferior_ptid));
else
- error ("No stack.");
+ error (_("No stack."));
return;
}
- gdb_thread_select (tidstr);
+ gdb_thread_select (uiout, tidstr, NULL);
+}
+
+/* Print notices when new threads are attached and detached. */
+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)
+{
+ fprintf_filtered (file, _("\
+Printing of thread events is %s.\n"),
+ value);
}
static int
-do_captured_thread_select (void *tidstr)
+do_captured_thread_select (struct ui_out *uiout, void *tidstr)
{
int num;
struct thread_info *tp;
- num = atoi ((char *)tidstr);
+ num = value_as_long (parse_and_eval (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
+ error (_("Thread ID %d not known."), num);
if (!thread_alive (tp))
- error ("Thread ID %d has terminated.\n", num);
+ error (_("Thread ID %d has terminated."), num);
- switch_to_thread (tp->pid);
+ switch_to_thread (tp->ptid);
-#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_field_int (uiout, "new-thread-id", pid_to_thread_id (inferior_ptid));
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, target_tid_to_str (inferior_ptid));
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);
+
+ print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC);
return GDB_RC_OK;
}
enum gdb_rc
-gdb_thread_select (char *tidstr)
+gdb_thread_select (struct ui_out *uiout, char *tidstr, char **error_message)
{
- return catch_errors (do_captured_thread_select, tidstr,
- NULL, RETURN_MASK_ALL);
+ if (catch_exceptions_with_msg (uiout, do_captured_thread_select, tidstr,
+ error_message, RETURN_MASK_ALL) < 0)
+ return GDB_RC_FAIL;
+ return GDB_RC_OK;
}
/* Commands with a prefix of `thread'. */
struct cmd_list_element *thread_cmd_list = NULL;
void
-_initialize_thread ()
+_initialize_thread (void)
{
static struct cmd_list_element *thread_apply_list = NULL;
add_info ("threads", info_threads_command,
- "IDs of currently known threads.");
+ _("IDs of currently known threads."));
- add_prefix_cmd ("thread", class_run, thread_command,
- "Use this command to switch between threads.\n\
-The new thread ID must be currently known.", &thread_cmd_list, "thread ", 1,
- &cmdlist);
+ add_prefix_cmd ("thread", class_run, thread_command, _("\
+Use this command to switch between threads.\n\
+The new thread ID must be currently known."),
+ &thread_cmd_list, "thread ", 1, &cmdlist);
add_prefix_cmd ("apply", class_run, thread_apply_command,
- "Apply a command to a list of threads.",
- &thread_apply_list, "apply ", 1, &thread_cmd_list);
+ _("Apply a command to a list of threads."),
+ &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."), &thread_apply_list);
if (!xdb_commands)
add_com_alias ("t", "thread", class_run, 1);
+
+ add_setshow_boolean_cmd ("thread-events", no_class,
+ &print_thread_events, _("\
+Set printing of thread events (e.g., thread start and exit)."), _("\
+Show printing of thread events (e.g., thread start and exit)."), NULL,
+ NULL,
+ show_print_thread_events,
+ &setprintlist, &showprintlist);
}
projects / deliverable / binutils-gdb.git / blobdiff