* dummy-frame.c (deprecated_pc_in_call_dummy): Add GDBARCH parameter,

[deliverable/binutils-gdb.git] / gdb / thread.c

diff --git a/gdb/thread.c b/gdb/thread.c
index 7a5927d105eb767785100f6a9417e6b3cd3117ba..536177130c6e009cd7717dc62e3c30419b7e76d2 100644 (file)
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -1,7 +1,8 @@
 /* Multi-process/thread control for GDB, the GNU debugger.
 
 /* Multi-process/thread control for GDB, the GNU debugger.
 

-   Copyright 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2007, 2008, 2009
+   Free Software Foundation, Inc.

 
    Contributed by Lynx Real-Time Systems, Inc.  Los Gatos, CA.
 
 
    Contributed by Lynx Real-Time Systems, Inc.  Los Gatos, CA.
 


@@ -9,7 +10,7 @@
 
    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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,9 +19,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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 "defs.h"
 #include "symtab.h"


@@ -30,6 +29,7 @@
 #include "value.h"
 #include "target.h"
 #include "gdbthread.h"
 #include "value.h"
 #include "target.h"
 #include "gdbthread.h"

+#include "exceptions.h"

 #include "command.h"
 #include "gdbcmd.h"
 #include "regcache.h"
 #include "command.h"
 #include "gdbcmd.h"
 #include "regcache.h"


@@ -40,8 +40,9 @@
 #include <sys/types.h>
 #include <signal.h>
 #include "ui-out.h"
 #include <sys/types.h>
 #include <signal.h>
 #include "ui-out.h"

-
-/*#include "lynxos-core.h" */
+#include "observer.h"
+#include "annotate.h"
+#include "cli/cli-decode.h"

 
 /* Definition of struct thread_info exported to gdbthread.h */
 
 
 /* Definition of struct thread_info exported to gdbthread.h */
 


@@ -54,41 +55,64 @@ void _initialize_thread (void);
 static struct thread_info *thread_list = NULL;
 static int highest_thread_num;
 
 static struct thread_info *thread_list = NULL;
 static int highest_thread_num;
 

-static struct thread_info *find_thread_id (int num);
-

 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 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 switch_to_thread (ptid_t ptid);

 static void prune_threads (void);
 
 static void prune_threads (void);
 

-void
-delete_step_resume_breakpoint (void *arg)
+/* Frontend view of the thread state.  Possible extensions: stepping,
+   finishing, until(ling),...  */
+enum thread_state

 {
 {

-  struct breakpoint **breakpointp = (struct breakpoint **) arg;
-  struct thread_info *tp;
+  THREAD_STOPPED,
+  THREAD_RUNNING,
+  THREAD_EXITED,
+};

 
 

-  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;
+struct thread_info*
+inferior_thread (void)
+{
+  struct thread_info *tp = find_thread_ptid (inferior_ptid);
+  gdb_assert (tp);
+  return tp;
+}

 
 

-      *breakpointp = NULL;
+void
+delete_step_resume_breakpoint (struct thread_info *tp)
+{
+  if (tp && tp->step_resume_breakpoint)
+    {
+      delete_breakpoint (tp->step_resume_breakpoint);
+      tp->step_resume_breakpoint = NULL;

     }
 }
 
 static void
     }
 }
 
 static void

-free_thread (struct thread_info *tp)
+clear_thread_inferior_resources (struct thread_info *tp)

 {
   /* NOTE: this will take care of any left-over step_resume breakpoints,
 {
   /* NOTE: this will take care of any left-over step_resume breakpoints,

-     but not any user-specified thread-specific 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)
   if (tp->step_resume_breakpoint)

-    delete_breakpoint (tp->step_resume_breakpoint);
+    {
+      tp->step_resume_breakpoint->disposition = disp_del_at_next_stop;
+      tp->step_resume_breakpoint = NULL;
+    }
+
+  bpstat_clear (&tp->stop_bpstat);
+
+  discard_all_intermediate_continuations_thread (tp);
+  discard_all_continuations_thread (tp);
+}
+
+static void
+free_thread (struct thread_info *tp)
+{
+  clear_thread_inferior_resources (tp);

 
   /* FIXME: do I ever need to call the back-end to give it a
      chance at this private data before deleting the thread?  */
 
   /* FIXME: do I ever need to call the back-end to give it a
      chance at this private data before deleting the thread?  */


@@ -104,6 +128,7 @@ init_thread_list (void)
   struct thread_info *tp, *tpnext;
 
   highest_thread_num = 0;
   struct thread_info *tp, *tpnext;
 
   highest_thread_num = 0;

+

   if (!thread_list)
     return;
 
   if (!thread_list)
     return;
 


@@ -116,25 +141,103 @@ init_thread_list (void)
   thread_list = NULL;
 }
 
   thread_list = NULL;
 }
 

-/* add_thread now returns a pointer to the new thread_info, 
-   so that back_ends can initialize their private data.  */
+/* Allocate a new thread with target id PTID and add it to the thread
+   list.  */

 
 

-struct thread_info *
-add_thread (ptid_t ptid)
+static struct thread_info *
+new_thread (ptid_t ptid)

 {
   struct thread_info *tp;
 
 {
   struct thread_info *tp;
 

-  tp = (struct thread_info *) xmalloc (sizeof (*tp));
-  memset (tp, 0, sizeof (*tp));
+  tp = xcalloc (1, sizeof (*tp));
+

   tp->ptid = ptid;
   tp->num = ++highest_thread_num;
   tp->next = thread_list;
   thread_list = tp;
   tp->ptid = ptid;
   tp->num = ++highest_thread_num;
   tp->next = thread_list;
   thread_list = tp;

+
+  /* Nothing to follow yet.  */
+  tp->pending_follow.kind = TARGET_WAITKIND_SPURIOUS;
+  tp->state_ = THREAD_STOPPED;
+

   return tp;
 }
 
   return tp;
 }
 

-void
-delete_thread (ptid_t ptid)
+struct thread_info *
+add_thread_silent (ptid_t ptid)
+{
+  struct thread_info *tp;
+
+  tp = find_thread_ptid (ptid);
+  if (tp)
+    /* Found an old thread with the same id.  It has to be dead,
+       otherwise we wouldn't be adding a new thread with the same id.
+       The OS is reusing this id --- delete it, and recreate a new
+       one.  */
+    {
+      /* In addition to deleting the thread, if this is the current
+        thread, then we need to take care that delete_thread doesn't
+        really delete the thread if it is inferior_ptid.  Create a
+        new template thread in the list with an invalid ptid, switch
+        to it, delete the original thread, reset the new thread's
+        ptid, and switch to it.  */
+
+      if (ptid_equal (inferior_ptid, ptid))
+       {
+         tp = new_thread (ptid);
+
+         /* Make switch_to_thread not read from the thread.  */
+         tp->state_ = THREAD_EXITED;
+         switch_to_thread (minus_one_ptid);
+
+         /* Now we can delete it.  */
+         delete_thread (ptid);
+
+         /* Now reset its ptid, and reswitch inferior_ptid to it.  */
+         tp->ptid = ptid;
+         tp->state_ = THREAD_STOPPED;
+         switch_to_thread (ptid);
+
+         observer_notify_new_thread (tp);
+
+         /* All done.  */
+         return tp;
+       }
+      else
+       /* Just go ahead and delete it.  */
+       delete_thread (ptid);
+    }
+
+  tp = new_thread (ptid);
+  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));
+
+  annotate_new_thread ();
+  return result;
+}
+
+struct thread_info *
+add_thread (ptid_t ptid)
+{
+  return add_thread_with_info (ptid, NULL);
+}
+
+/* Delete thread PTID.  If SILENT, don't notify the observer of this
+   exit.  */
+static void
+delete_thread_1 (ptid_t ptid, int silent)

 {
   struct thread_info *tp, *tpprev;
 
 {
   struct thread_info *tp, *tpprev;
 


@@ -147,15 +250,56 @@ delete_thread (ptid_t ptid)
   if (!tp)
     return;
 
   if (!tp)
     return;
 

+  /* If this is the current thread, or there's code out there that
+     relies on it existing (refcount > 0) we can't delete yet.  Mark
+     it as exited, and notify it.  */
+  if (tp->refcount > 0
+      || ptid_equal (tp->ptid, inferior_ptid))
+    {
+      if (tp->state_ != THREAD_EXITED)
+       {
+         observer_notify_thread_exit (tp, silent);
+
+         /* Tag it as exited.  */
+         tp->state_ = THREAD_EXITED;
+
+         /* Clear breakpoints, etc. associated with this thread.  */
+         clear_thread_inferior_resources (tp);
+       }
+
+       /* Will be really deleted some other time.  */
+       return;
+     }
+

   if (tpprev)
     tpprev->next = tp->next;
   else
     thread_list = tp->next;
 
   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);
 }
 
   free_thread (tp);
 }
 

-static struct thread_info *
+/* Delete thread PTID and notify of thread exit.  If this is
+   inferior_ptid, don't actually delete it, but tag it as exited and
+   do the notification.  If PTID is the user selected thread, clear
+   it.  */
+void
+delete_thread (ptid_t ptid)
+{
+  delete_thread_1 (ptid, 0 /* not silent */);
+}
+
+void
+delete_thread_silent (ptid_t ptid)
+{
+  delete_thread_1 (ptid, 1 /* silent */);
+}
+
+struct thread_info *

 find_thread_id (int num)
 {
   struct thread_info *tp;
 find_thread_id (int num)
 {
   struct thread_info *tp;


@@ -169,7 +313,7 @@ find_thread_id (int num)
 
 /* Find a thread_info by matching PTID.  */
 struct thread_info *
 
 /* Find a thread_info by matching PTID.  */
 struct thread_info *

-find_thread_pid (ptid_t ptid)
+find_thread_ptid (ptid_t ptid)

 {
   struct thread_info *tp;
 
 {
   struct thread_info *tp;
 


@@ -198,13 +342,28 @@ struct thread_info *
 iterate_over_threads (int (*callback) (struct thread_info *, void *),
                      void *data)
 {
 iterate_over_threads (int (*callback) (struct thread_info *, void *),
                      void *data)
 {

+  struct thread_info *tp, *next;
+
+  for (tp = thread_list; tp; tp = next)
+    {
+      next = tp->next;
+      if ((*callback) (tp, data))
+       return tp;
+    }
+
+  return NULL;
+}
+
+int
+thread_count (void)
+{
+  int result = 0;

   struct thread_info *tp;
 
   for (tp = thread_list; tp; tp = tp->next)
   struct thread_info *tp;
 
   for (tp = thread_list; tp; tp = tp->next)

-    if ((*callback) (tp, data))
-      return tp;
+    ++result;

 
 

-  return NULL;
+  return result;  

 }
 
 int
 }
 
 int


@@ -253,6 +412,22 @@ in_thread_list (ptid_t ptid)
   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,
+   return the first thread in the list.  */
+
+struct thread_info *
+first_thread_of_process (int pid)
+{
+  struct thread_info *tp, *ret = NULL;
+
+  for (tp = thread_list; tp; tp = tp->next)
+    if (pid == -1 || ptid_get_pid (tp->ptid) == pid)
+      if (ret == NULL || tp->num < ret->num)
+       ret = tp;
+
+  return ret;
+}
+

 /* Print a list of thread ids currently known, and the total number of
    threads. To be used from within catch_errors. */
 static int
 /* Print a list of thread ids currently known, and the total number of
    threads. To be used from within catch_errors. */
 static int


@@ -261,6 +436,7 @@ do_captured_list_thread_ids (struct ui_out *uiout, void *arg)
   struct thread_info *tp;
   int num = 0;
   struct cleanup *cleanup_chain;
   struct thread_info *tp;
   int num = 0;
   struct cleanup *cleanup_chain;

+  int current_thread = -1;

 
   prune_threads ();
   target_find_new_threads ();
 
   prune_threads ();
   target_find_new_threads ();


@@ -269,11 +445,20 @@ do_captured_list_thread_ids (struct ui_out *uiout, void *arg)
 
   for (tp = thread_list; tp; tp = tp->next)
     {
 
   for (tp = thread_list; tp; tp = tp->next)
     {

+      if (tp->state_ == THREAD_EXITED)
+       continue;
+
+      if (ptid_equal (tp->ptid, inferior_ptid))
+       current_thread = tp->num;
+

       num++;
       ui_out_field_int (uiout, "thread-id", tp->num);
     }
 
   do_cleanups (cleanup_chain);
       num++;
       ui_out_field_int (uiout, "thread-id", tp->num);
     }
 
   do_cleanups (cleanup_chain);

+
+  if (current_thread != -1)
+    ui_out_field_int (uiout, "current-thread-id", current_thread);

   ui_out_field_int (uiout, "number-of-threads", num);
   return GDB_RC_OK;
 }
   ui_out_field_int (uiout, "number-of-threads", num);
   return GDB_RC_OK;
 }


@@ -281,230 +466,533 @@ 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. */
 enum gdb_rc
 /* Official gdblib interface function to get a list of thread ids and
    the total number. */
 enum gdb_rc

-gdb_list_thread_ids (struct ui_out *uiout)
+gdb_list_thread_ids (struct ui_out *uiout, char **error_message)

 {
 {

-  return catch_exceptions (uiout, 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;

 }
 
 }
 

-/* Load infrun state for the thread PID.  */
+/* Return true if TP is an active thread. */
+static int
+thread_alive (struct thread_info *tp)
+{
+  if (tp->state_ == THREAD_EXITED)
+    return 0;
+  if (!target_thread_alive (tp->ptid))
+    return 0;
+  return 1;
+}
+
+static void
+prune_threads (void)
+{
+  struct thread_info *tp, *next;
+
+  for (tp = thread_list; tp; tp = next)
+    {
+      next = tp->next;
+      if (!thread_alive (tp))
+       delete_thread (tp->ptid);
+    }
+}

 
 void
 
 void

-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 *handling_longjmp,
-                  int *another_trap,
-                  int *stepping_through_solib_after_catch,
-                  bpstat *stepping_through_solib_catchpoints,
-                  int *stepping_through_sigtramp,
-                  int *current_line,
-                  struct symtab **current_symtab)
+thread_change_ptid (ptid_t old_ptid, ptid_t new_ptid)

 {
 {

+  struct inferior *inf;

   struct thread_info *tp;
 
   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 (ptid));
-  if (tp == NULL)
-    return;
+  /* It can happen that what we knew as the target inferior id
+     changes.  E.g, target remote may only discover the remote process
+     pid after adding the inferior to GDB's list.  */
+  inf = find_inferior_pid (ptid_get_pid (old_ptid));
+  inf->pid = ptid_get_pid (new_ptid);
+
+  tp = find_thread_ptid (old_ptid);
+  tp->ptid = new_ptid;

 
 

-  *prev_pc = tp->prev_pc;
-  *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_id = tp->step_frame_id;
-  *handling_longjmp = tp->handling_longjmp;
-  *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;
-  *current_line = tp->current_line;
-  *current_symtab = tp->current_symtab;
-}
-
-/* Save infrun state for the thread PID.  */
+  observer_notify_thread_ptid_changed (old_ptid, new_ptid);
+}

 
 void
 
 void

-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 handling_longjmp,
-                  int another_trap,
-                  int stepping_through_solib_after_catch,
-                  bpstat stepping_through_solib_catchpoints,
-                  int stepping_through_sigtramp,
-                  int current_line,
-                  struct symtab *current_symtab)
+set_running (ptid_t ptid, int running)

 {
   struct thread_info *tp;
 {
   struct thread_info *tp;

+  int all = ptid_equal (ptid, minus_one_ptid);

 
 

-  /* 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 (ptid));
-  if (tp == NULL)
-    return;
-
-  tp->prev_pc = prev_pc;
-  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_id = (*step_frame_id);
-  tp->handling_longjmp = handling_longjmp;
-  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;
-  tp->current_line = current_line;
-  tp->current_symtab = current_symtab;
+  /* 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)
+             continue;
+           if (running && tp->state_ == THREAD_STOPPED)
+             any_started = 1;
+           tp->state_ = running ? THREAD_RUNNING : THREAD_STOPPED;
+         }
+      if (any_started)
+       observer_notify_target_resumed (ptid);
+    }
+  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);
+    }

 }
 
 }
 

-/* Return true if TP is an active thread. */

 static int
 static int

-thread_alive (struct thread_info *tp)
+is_thread_state (ptid_t ptid, enum thread_state state)

 {
 {

-  if (PIDGET (tp->ptid) == -1)
-    return 0;
-  if (!target_thread_alive (tp->ptid))
+  struct thread_info *tp;
+
+  tp = find_thread_ptid (ptid);
+  gdb_assert (tp);
+  return tp->state_ == state;
+}
+
+int
+is_stopped (ptid_t ptid)
+{
+  return is_thread_state (ptid, THREAD_STOPPED);
+}
+
+int
+is_exited (ptid_t ptid)
+{
+  return is_thread_state (ptid, THREAD_EXITED);
+}
+
+int
+is_running (ptid_t ptid)
+{
+  return is_thread_state (ptid, THREAD_RUNNING);
+}
+
+int
+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)
+{
+  struct thread_info *tp;
+
+  tp = find_thread_ptid (ptid);
+  gdb_assert (tp);
+  return tp->executing_;
+}
+
+void
+set_executing (ptid_t ptid, int executing)
+{
+  struct thread_info *tp;
+  int all = ptid_equal (ptid, minus_one_ptid);
+
+  if (all || ptid_is_pid (ptid))

     {
     {

-      tp->ptid = pid_to_ptid (-1);     /* Mark it as dead */
-      return 0;
+      for (tp = thread_list; tp; tp = tp->next)
+       if (all || ptid_get_pid (tp->ptid) == ptid_get_pid (ptid))
+         tp->executing_ = executing;
+    }
+  else
+    {
+      tp = find_thread_ptid (ptid);
+      gdb_assert (tp);
+      tp->executing_ = executing;

     }
     }

-  return 1;

 }
 
 }
 

-static void
-prune_threads (void)
+void
+set_stop_requested (ptid_t ptid, int stop)

 {
 {

-  struct thread_info *tp, *next;
+  struct thread_info *tp;
+  int all = ptid_equal (ptid, minus_one_ptid);

 
 

-  for (tp = thread_list; tp; tp = next)
+  if (all || ptid_is_pid (ptid))

     {
     {

-      next = tp->next;
-      if (!thread_alive (tp))
-       delete_thread (tp->ptid);
+      for (tp = thread_list; tp; tp = tp->next)
+       if (all || ptid_get_pid (tp->ptid) == ptid_get_pid (ptid))
+         tp->stop_requested = stop;

     }
     }

+  else
+    {
+      tp = find_thread_ptid (ptid);
+      gdb_assert (tp);
+      tp->stop_requested = stop;
+    }
+
+  /* Call the stop requested observer so other components of GDB can
+     react to this request.  */
+  if (stop)
+    observer_notify_thread_stop_requested (ptid);

 }
 
 }
 

-/* Print information about currently known threads 
+void
+finish_thread_state (ptid_t ptid)
+{
+  struct thread_info *tp;
+  int all;
+  int any_started = 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.
- */
+  all = ptid_equal (ptid, minus_one_ptid);

 
 

-static void
-info_threads_command (char *arg, int from_tty)
+  if (all || ptid_is_pid (ptid))
+    {
+      for (tp = thread_list; tp; tp = tp->next)
+       {
+         if (tp->state_ == THREAD_EXITED)
+           continue;
+         if (all || ptid_get_pid (ptid) == ptid_get_pid (tp->ptid))
+           {
+             if (tp->executing_ && tp->state_ == THREAD_STOPPED)
+               any_started = 1;
+             tp->state_ = tp->executing_ ? THREAD_RUNNING : THREAD_STOPPED;
+           }
+       }
+    }
+  else
+    {
+      tp = find_thread_ptid (ptid);
+      gdb_assert (tp);
+      if (tp->state_ != THREAD_EXITED)
+       {
+         if (tp->executing_ && tp->state_ == THREAD_STOPPED)
+           any_started = 1;
+         tp->state_ = tp->executing_ ? THREAD_RUNNING : THREAD_STOPPED;
+       }
+    }
+
+  if (any_started)
+    observer_notify_target_resumed (ptid);
+}
+
+void
+finish_thread_state_cleanup (void *arg)
+{
+  ptid_t *ptid_p = 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.  */
+void
+print_thread_info (struct ui_out *uiout, int requested_thread, int pid)

 {
   struct thread_info *tp;
   ptid_t current_ptid;
 {
   struct thread_info *tp;
   ptid_t current_ptid;

-  struct frame_info *cur_frame;
-  struct frame_id saved_frame_id = get_frame_id (get_selected_frame ());
+  struct cleanup *old_chain;

   char *extra_info;
   char *extra_info;

+  int current_thread = -1;

 
   prune_threads ();
   target_find_new_threads ();
   current_ptid = inferior_ptid;
 
   prune_threads ();
   target_find_new_threads ();
   current_ptid = inferior_ptid;

+
+  /* 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 (tp = thread_list; tp; tp = tp->next)
     {

+      struct cleanup *chain2;
+
+      if (requested_thread != -1 && tp->num != requested_thread)
+       continue;
+
+      if (pid != -1 && PIDGET (tp->ptid) != pid)
+       {
+         if (requested_thread != -1)
+           error (_("Requested thread not found in requested process"));
+         continue;
+       }
+
+      if (ptid_equal (tp->ptid, current_ptid))
+       current_thread = tp->num;
+
+      if (tp->state_ == THREAD_EXITED)
+       continue;
+
+      chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
+

       if (ptid_equal (tp->ptid, current_ptid))
       if (ptid_equal (tp->ptid, current_ptid))

-       printf_filtered ("* ");
+       ui_out_text (uiout, "* ");

       else
       else

-       printf_filtered ("  ");
+       ui_out_text (uiout, "  ");

 
 

-#ifdef HPUXHPPA
-      printf_filtered ("%d %s", tp->num, target_tid_to_str (tp->ptid));
-#else
-      printf_filtered ("%d %s", tp->num, target_pid_to_str (tp->ptid));
-#endif
+      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));

 
       extra_info = target_extra_thread_info (tp);
       if (extra_info)
 
       extra_info = target_extra_thread_info (tp);
       if (extra_info)

-       printf_filtered (" (%s)", extra_info);
-      puts_filtered ("  ");
+       {
+         ui_out_text (uiout, " (");
+         ui_out_field_string (uiout, "details", extra_info);
+         ui_out_text (uiout, ")");
+       }
+      ui_out_text (uiout, "  ");

 
 

-      switch_to_thread (tp->ptid);
-      print_stack_frame (get_selected_frame (), 0, LOCATION);
-    }
+      if (tp->state_ == THREAD_RUNNING)
+       ui_out_text (uiout, "(running)\n");
+      else
+       {
+         /* The switch below puts us at the top of the stack (leaf
+            frame).  */
+         switch_to_thread (tp->ptid);
+         print_stack_frame (get_selected_frame (NULL),
+                            /* For MI output, print frame level.  */
+                            ui_out_is_mi_like_p (uiout),
+                            LOCATION);
+       }

 
 

-  switch_to_thread (current_ptid);
+      if (ui_out_is_mi_like_p (uiout))
+       {
+         char *state = "stopped";
+         if (tp->state_ == THREAD_RUNNING)
+           state = "running";
+         ui_out_field_string (uiout, "state", state);
+       }

 
 

-  /* 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).  */
-  cur_frame = frame_find_by_id (saved_frame_id);
-  if (cur_frame == NULL)
-    {
-      /* Ooops, can't restore, tell user where we are.  */
-      warning ("Couldn't restore frame in current thread, at frame 0");
-      print_stack_frame (get_selected_frame (), 0, LOCATION);
+      do_cleanups (chain2);

     }
     }

-  else
+
+  /* Restores the current thread and the frame selected before
+     the "info threads" command.  */
+  do_cleanups (old_chain);
+
+  if (pid == -1 && requested_thread == -1)

     {
     {

-      select_frame (cur_frame);
-      /* re-show current frame. */
-      show_stack_frame (cur_frame);
+      gdb_assert (current_thread != -1
+                 || !thread_list
+                 || ptid_equal (inferior_ptid, null_ptid));
+      if (current_thread != -1 && ui_out_is_mi_like_p (uiout))
+       ui_out_field_int (uiout, "current-thread-id", current_thread);
+
+      if (current_thread != -1 && is_exited (current_ptid))
+       ui_out_message (uiout, 0, "\n\
+The current thread <Thread ID %d> has terminated.  See `help thread'.\n",
+                       current_thread);
+      else if (thread_list
+              && current_thread == -1
+              && ptid_equal (current_ptid, null_ptid))
+       ui_out_message (uiout, 0, "\n\
+No selected thread.  See `help thread'.\n");

     }
 }
 
     }
 }
 

-/* Switch from one thread to another. */
+
+/* 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
 
 static void

+info_threads_command (char *arg, int from_tty)
+{
+  print_thread_info (uiout, -1, -1);
+}
+
+/* Switch from one thread to another. */
+
+void

 switch_to_thread (ptid_t ptid)
 {
   if (ptid_equal (ptid, inferior_ptid))
     return;
 
   inferior_ptid = ptid;
 switch_to_thread (ptid_t ptid)
 {
   if (ptid_equal (ptid, inferior_ptid))
     return;
 
   inferior_ptid = ptid;

-  flush_cached_frames ();
+  reinit_frame_cache ();

   registers_changed ();
   registers_changed ();

-  stop_pc = read_pc ();
-  select_frame (get_current_frame ());
+
+  /* We don't check for is_stopped, because we're called at times
+     while in the TARGET_RUNNING state, e.g., while handling an
+     internal event.  */
+  if (!ptid_equal (inferior_ptid, null_ptid)
+      && !is_exited (ptid)
+      && !is_executing (ptid))
+    stop_pc = regcache_read_pc (get_thread_regcache (ptid));
+  else
+    stop_pc = ~(CORE_ADDR) 0;

 }
 
 static void
 restore_current_thread (ptid_t ptid)
 {
 }
 
 static void
 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, int frame_level)
+{
+  struct frame_info *frame = NULL;
+  int count;
+
+  gdb_assert (frame_level >= 0);
+
+  /* Restore by level first, check if the frame id is the same as
+     expected.  If that fails, try restoring by frame id.  If that
+     fails, nothing to do, just warn the user.  */
+
+  count = frame_level;
+  frame = find_relative_frame (get_current_frame (), &count);
+  if (count == 0
+      && frame != NULL
+      /* Either the frame ids match, of they're both invalid.  The
+        latter case is not failsafe, but since it's highly unlikely
+        the search by level finds the wrong frame, it's 99.9(9)% of
+        the time (for all practical purposes) safe.  */
+      && (frame_id_eq (get_frame_id (frame), a_frame_id)
+         /* Note: could be better to check every frame_id
+            member for equality here.  */
+         || (!frame_id_p (get_frame_id (frame))
+             && !frame_id_p (a_frame_id))))

     {
     {

-      switch_to_thread (ptid);
-      print_stack_frame (get_current_frame (), 1, SRC_LINE);
+      /* Cool, all is fine.  */
+      select_frame (frame);
+      return;
+    }
+
+  frame = frame_find_by_id (a_frame_id);
+  if (frame != NULL)
+    {
+      /* Cool, refound it.  */
+      select_frame (frame);
+      return;
+    }
+
+  /* Nothing else to do, the frame layout really changed.  Select the
+     innermost stack frame.  */
+  select_frame (get_current_frame ());
+
+  /* Warn the user.  */
+  if (!ui_out_is_mi_like_p (uiout))
+    {
+      warning (_("\
+Couldn't restore frame #%d in current thread, at reparsed frame #0\n"),
+              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);

     }
 }
 
 struct current_thread_cleanup
 {
   ptid_t inferior_ptid;
     }
 }
 
 struct current_thread_cleanup
 {
   ptid_t inferior_ptid;

+  struct frame_id selected_frame_id;
+  int selected_frame_level;
+  int was_stopped;

 };
 
 static void
 do_restore_current_thread_cleanup (void *arg)
 {
 };
 
 static void
 do_restore_current_thread_cleanup (void *arg)
 {

+  struct thread_info *tp;

   struct current_thread_cleanup *old = arg;
   struct current_thread_cleanup *old = arg;

-  restore_current_thread (old->inferior_ptid);
+
+  tp = find_thread_ptid (old->inferior_ptid);
+
+  /* If the previously selected thread belonged to a process that has
+     in the mean time been deleted (due to normal exit, detach, etc.),
+     then don't revert back to it, but instead simply drop back to no
+     thread selected.  */
+  if (tp
+      && find_inferior_pid (ptid_get_pid (tp->ptid)) != NULL)
+    restore_current_thread (old->inferior_ptid);
+  else
+    restore_current_thread (null_ptid);
+
+  /* The running state of the originally selected thread may have
+     changed, so we have to recheck it here.  */
+  if (!ptid_equal (inferior_ptid, null_ptid)
+      && old->was_stopped
+      && is_stopped (inferior_ptid)
+      && target_has_registers
+      && target_has_stack
+      && target_has_memory)
+    restore_selected_frame (old->selected_frame_id,
+                           old->selected_frame_level);
+}
+
+static void
+restore_current_thread_cleanup_dtor (void *arg)
+{
+  struct current_thread_cleanup *old = arg;
+  struct thread_info *tp;
+  tp = find_thread_ptid (old->inferior_ptid);
+  if (tp)
+    tp->refcount--;

   xfree (old);
 }
 
   xfree (old);
 }
 

-static struct cleanup *
-make_cleanup_restore_current_thread (ptid_t inferior_ptid)
+struct cleanup *
+make_cleanup_restore_current_thread (void)

 {
 {

-  struct current_thread_cleanup *old
-    = xmalloc (sizeof (struct current_thread_cleanup));
+  struct thread_info *tp;
+  struct frame_info *frame;
+  struct current_thread_cleanup *old;
+
+  old = xmalloc (sizeof (struct current_thread_cleanup));

   old->inferior_ptid = inferior_ptid;
   old->inferior_ptid = inferior_ptid;

-  return make_cleanup (do_restore_current_thread_cleanup, old);
+
+  if (!ptid_equal (inferior_ptid, null_ptid))
+    {
+      old->was_stopped = is_stopped (inferior_ptid);
+      if (old->was_stopped
+         && target_has_registers
+         && target_has_stack
+         && target_has_memory)
+       frame = get_selected_frame (NULL);
+      else
+       frame = NULL;
+
+      old->selected_frame_id = get_frame_id (frame);
+      old->selected_frame_level = frame_relative_level (frame);
+
+      tp = find_thread_ptid (inferior_ptid);
+      if (tp)
+       tp->refcount++;
+    }
+
+  return make_cleanup_dtor (do_restore_current_thread_cleanup, old,
+                           restore_current_thread_cleanup_dtor);

 }
 
 /* Apply a GDB command to a list of threads.  List syntax is a whitespace
 }
 
 /* Apply a GDB command to a list of threads.  List syntax is a whitespace


@@ -521,38 +1009,31 @@ thread_apply_all_command (char *cmd, int from_tty)
 {
   struct thread_info *tp;
   struct cleanup *old_chain;
 {
   struct thread_info *tp;
   struct cleanup *old_chain;

-  struct cleanup *saved_cmd_cleanup_chain;

   char *saved_cmd;
 
   if (cmd == NULL || *cmd == '\000')
   char *saved_cmd;
 
   if (cmd == NULL || *cmd == '\000')

-    error ("Please specify a command following the thread ID list");
-
-  old_chain = make_cleanup_restore_current_thread (inferior_ptid);
+    error (_("Please specify a command following the thread ID list"));

 
 

-  /* It is safe to update the thread list now, before
-     traversing it for "thread apply all".  MVS */
+  prune_threads ();

   target_find_new_threads ();
 
   target_find_new_threads ();
 

+  old_chain = make_cleanup_restore_current_thread ();
+

   /* Save a copy of the command in case it is clobbered by
      execute_command */
   saved_cmd = xstrdup (cmd);
   /* 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);
+  make_cleanup (xfree, saved_cmd);

   for (tp = thread_list; tp; tp = tp->next)
     if (thread_alive (tp))
       {
        switch_to_thread (tp->ptid);
   for (tp = thread_list; tp; tp = tp->next)
     if (thread_alive (tp))
       {
        switch_to_thread (tp->ptid);

-#ifdef HPUXHPPA
-       printf_filtered ("\nThread %d (%s):\n",
-                        tp->num, target_tid_to_str (inferior_ptid));
-#else
-       printf_filtered ("\nThread %d (%s):\n", tp->num,
-                        target_pid_to_str (inferior_ptid));
-#endif
+
+       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 */
       }
 
        execute_command (cmd, from_tty);
        strcpy (cmd, saved_cmd);        /* Restore exact command used previously */
       }
 

-  do_cleanups (saved_cmd_cleanup_chain);

   do_cleanups (old_chain);
 }
 
   do_cleanups (old_chain);
 }
 


@@ -562,23 +1043,20 @@ thread_apply_command (char *tidlist, int from_tty)
   char *cmd;
   char *p;
   struct cleanup *old_chain;
   char *cmd;
   char *p;
   struct cleanup *old_chain;

-  struct cleanup *saved_cmd_cleanup_chain;

   char *saved_cmd;
 
   if (tidlist == NULL || *tidlist == '\000')
   char *saved_cmd;
 
   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')
 
   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_restore_current_thread (inferior_ptid);
+    error (_("Please specify a command following the thread ID list"));

 
   /* Save a copy of the command in case it is clobbered by
      execute_command */
   saved_cmd = xstrdup (cmd);
 
   /* 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);
+  old_chain = make_cleanup (xfree, saved_cmd);

   while (tidlist < cmd)
     {
       struct thread_info *tp;
   while (tidlist < cmd)
     {
       struct thread_info *tp;


@@ -586,7 +1064,7 @@ thread_apply_command (char *tidlist, int from_tty)
 
       start = strtol (tidlist, &p, 10);
       if (p == tidlist)
 
       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 = p;
 
       while (*tidlist == ' ' || *tidlist == '\t')


@@ -597,7 +1075,7 @@ thread_apply_command (char *tidlist, int from_tty)
          tidlist++;            /* Skip the - */
          end = strtol (tidlist, &p, 10);
          if (p == tidlist)
          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')
          tidlist = p;
 
          while (*tidlist == ' ' || *tidlist == '\t')


@@ -606,31 +1084,30 @@ thread_apply_command (char *tidlist, int from_tty)
       else
        end = start;
 
       else
        end = start;
 

+      make_cleanup_restore_current_thread ();
+

       for (; start <= end; start++)
        {
          tp = find_thread_id (start);
 
          if (!tp)
       for (; start <= end; start++)
        {
          tp = find_thread_id (start);
 
          if (!tp)

-           warning ("Unknown thread %d.", start);
+           warning (_("Unknown thread %d."), start);

          else if (!thread_alive (tp))
          else if (!thread_alive (tp))

-           warning ("Thread %d has terminated.", start);
+           warning (_("Thread %d has terminated."), start);

          else
            {
              switch_to_thread (tp->ptid);
          else
            {
              switch_to_thread (tp->ptid);

-#ifdef HPUXHPPA
-             printf_filtered ("\nThread %d (%s):\n", tp->num,
-                              target_tid_to_str (inferior_ptid));
-#else
-             printf_filtered ("\nThread %d (%s):\n", tp->num,
+
+             printf_filtered (_("\nThread %d (%s):\n"), tp->num,

                               target_pid_to_str (inferior_ptid));
                               target_pid_to_str (inferior_ptid));

-#endif

              execute_command (cmd, from_tty);
              execute_command (cmd, from_tty);

-             strcpy (cmd, saved_cmd);  /* Restore exact command used previously */
+
+             /* Restore exact command used previously.  */
+             strcpy (cmd, saved_cmd);

            }
        }
     }
 
            }
        }
     }
 

-  do_cleanups (saved_cmd_cleanup_chain);

   do_cleanups (old_chain);
 }
 
   do_cleanups (old_chain);
 }
 


@@ -642,22 +1119,37 @@ thread_command (char *tidstr, int from_tty)
 {
   if (!tidstr)
     {
 {
   if (!tidstr)
     {

-      /* Don't generate an error, just say which thread is current. */
+      if (ptid_equal (inferior_ptid, null_ptid))
+       error (_("No thread selected"));
+

       if (target_has_stack)
       if (target_has_stack)

-       printf_filtered ("[Current thread is %d (%s)]\n",
-                        pid_to_thread_id (inferior_ptid),
-#if defined(HPUXHPPA)
-                        target_tid_to_str (inferior_ptid)
-#else
-                        target_pid_to_str (inferior_ptid)
-#endif
-         );
+       {
+         if (is_exited (inferior_ptid))
+           printf_filtered (_("[Current thread is %d (%s) (exited)]\n"),
+                            pid_to_thread_id (inferior_ptid),
+                            target_pid_to_str (inferior_ptid));
+         else
+           printf_filtered (_("[Current thread is %d (%s)]\n"),
+                            pid_to_thread_id (inferior_ptid),
+                            target_pid_to_str (inferior_ptid));
+       }

       else
       else

-       error ("No stack.");
+       error (_("No stack."));

       return;
     }
 
       return;
     }
 

-  gdb_thread_select (uiout, 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
 }
 
 static int


@@ -671,32 +1163,42 @@ do_captured_thread_select (struct ui_out *uiout, void *tidstr)
   tp = find_thread_id (num);
 
   if (!tp)
   tp = find_thread_id (num);
 
   if (!tp)

-    error ("Thread ID %d not known.", num);
+    error (_("Thread ID %d not known."), num);

 
   if (!thread_alive (tp))
 
   if (!thread_alive (tp))

-    error ("Thread ID %d has terminated.\n", num);
+    error (_("Thread ID %d has terminated."), num);

 
   switch_to_thread (tp->ptid);
 
 
   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, "[Switching to thread ");
   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_ptid));
-#else

   ui_out_text (uiout, target_pid_to_str (inferior_ptid));
   ui_out_text (uiout, target_pid_to_str (inferior_ptid));

-#endif

   ui_out_text (uiout, ")]");
 
   ui_out_text (uiout, ")]");
 

-  print_stack_frame (get_selected_frame (), 1, SRC_AND_LOC);
+  /* Note that we can't reach this with an exited thread, due to the
+     thread_alive check above.  */
+  if (tp->state_ == THREAD_RUNNING)
+    ui_out_text (uiout, "(running)\n");
+  else
+    print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC);
+
+  /* Since the current thread may have changed, see if there is any
+     exited thread we can now delete.  */
+  prune_threads ();
+

   return GDB_RC_OK;
 }
 
 enum gdb_rc
   return GDB_RC_OK;
 }
 
 enum gdb_rc

-gdb_thread_select (struct ui_out *uiout, char *tidstr)
+gdb_thread_select (struct ui_out *uiout, char *tidstr, char **error_message)

 {
 {

-  return catch_exceptions (uiout, 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'.  */
 }
 
 /* Commands with a prefix of `thread'.  */


@@ -708,19 +1210,28 @@ _initialize_thread (void)
   static struct cmd_list_element *thread_apply_list = NULL;
 
   add_info ("threads", info_threads_command,
   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,
 
   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,
 
   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);
 
   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 (such as thread start and exit)."), _("\
+Show printing of thread events (such as thread start and exit)."), NULL,
+         NULL,
+         show_print_thread_events,
+         &setprintlist, &showprintlist);

 }
 }