/* Multi-process/thread control for GDB, the GNU debugger.
- Copyright (C) 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 1986-2014 Free Software Foundation, Inc.
Contributed by Lynx Real-Time Systems, Inc. Los Gatos, CA.
#include "gdbcmd.h"
#include "regcache.h"
#include "gdb.h"
-#include "gdb_string.h"
+#include <string.h>
+#include "btrace.h"
#include <ctype.h>
#include <sys/types.h>
/* Prototypes for local functions. */
-static struct thread_info *thread_list = NULL;
+struct thread_info *thread_list = NULL;
static int highest_thread_num;
static void thread_command (char *tidstr, int from_tty);
static void restore_current_thread (ptid_t);
static void prune_threads (void);
+/* Data to cleanup thread array. */
+
+struct thread_array_cleanup
+{
+ /* Array of thread pointers used to set
+ reference count. */
+ struct thread_info **tp_array;
+
+ /* Thread count in the array. */
+ int count;
+};
+
+
struct thread_info*
inferior_thread (void)
{
tp->control.exception_resume_breakpoint = NULL;
}
+ delete_longjmp_breakpoint_at_next_stop (tp->num);
+
bpstat_clear (&tp->control.stop_bpstat);
+ btrace_teardown (tp);
+
do_all_intermediate_continuations_thread (tp, 1);
do_all_continuations_thread (tp, 1);
-
- delete_longjmp_breakpoint (tp->num);
}
static void
finish_thread_state (*ptid_p);
}
+int
+pc_in_thread_step_range (CORE_ADDR pc, struct thread_info *thread)
+{
+ return (pc >= thread->control.step_range_start
+ && pc < thread->control.step_range_end);
+}
+
/* Prints the list of threads and their details on UIOUT.
This is a version of 'info_threads_command' suitable for
use from MI.
if (!number_is_in_list (requested_threads, tp->num))
continue;
- if (pid != -1 && PIDGET (tp->ptid) != pid)
+ if (pid != -1 && ptid_get_pid (tp->ptid) != pid)
continue;
if (tp->state == THREAD_EXITED)
if (!number_is_in_list (requested_threads, tp->num))
continue;
- if (pid != -1 && PIDGET (tp->ptid) != pid)
+ if (pid != -1 && ptid_get_pid (tp->ptid) != pid)
{
if (requested_threads != NULL && *requested_threads != '\0')
error (_("Requested thread not found in requested process"));
print_stack_frame (get_selected_frame (NULL),
/* For MI output, print frame level. */
ui_out_is_mi_like_p (uiout),
- LOCATION);
+ LOCATION, 0);
}
if (ui_out_is_mi_like_p (uiout))
inferior_ptid = ptid;
reinit_frame_cache ();
- registers_changed ();
/* We don't check for is_stopped, because we're called at times
while in the TARGET_RUNNING state, e.g., while handling an
if (frame_level > 0 && !ui_out_is_mi_like_p (current_uiout))
{
warning (_("Couldn't restore frame #%d in "
- "current thread, at reparsed frame #0\n"),
+ "current thread. Bottom (innermost) frame selected:"),
frame_level);
/* For MI, we should probably have a notification about
current frame change. But this error is not very
likely, so don't bother for now. */
- print_stack_frame (get_selected_frame (NULL), 1, SRC_LINE);
+ print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1);
}
}
int selected_frame_level;
int was_stopped;
int inf_id;
+ int was_removable;
};
static void
{
struct current_thread_cleanup *old = arg;
struct thread_info *tp;
+ struct inferior *inf;
tp = find_thread_ptid (old->inferior_ptid);
if (tp)
tp->refcount--;
+ inf = find_inferior_id (old->inf_id);
+ if (inf != NULL)
+ inf->removable = old->was_removable;
xfree (old);
}
+/* Set the thread reference count. */
+
+static void
+set_thread_refcount (void *data)
+{
+ int k;
+ struct thread_array_cleanup *ta_cleanup = data;
+
+ for (k = 0; k != ta_cleanup->count; k++)
+ ta_cleanup->tp_array[k]->refcount--;
+}
+
struct cleanup *
make_cleanup_restore_current_thread (void)
{
old = xmalloc (sizeof (struct current_thread_cleanup));
old->inferior_ptid = inferior_ptid;
old->inf_id = current_inferior ()->num;
+ old->was_removable = current_inferior ()->removable;
if (!ptid_equal (inferior_ptid, null_ptid))
{
tp->refcount++;
}
+ current_inferior ()->removable = 0;
+
return make_cleanup_dtor (do_restore_current_thread_cleanup, old,
restore_current_thread_cleanup_dtor);
}
static void
thread_apply_all_command (char *cmd, int from_tty)
{
- struct thread_info *tp;
struct cleanup *old_chain;
char *saved_cmd;
+ int tc;
+ struct thread_array_cleanup ta_cleanup;
if (cmd == NULL || *cmd == '\000')
error (_("Please specify a command following the thread ID list"));
execute_command. */
saved_cmd = xstrdup (cmd);
make_cleanup (xfree, saved_cmd);
- for (tp = thread_list; tp; tp = tp->next)
- if (thread_alive (tp))
- {
- switch_to_thread (tp->ptid);
+ tc = thread_count ();
- 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. */
- }
+ if (tc)
+ {
+ struct thread_info **tp_array;
+ struct thread_info *tp;
+ int i = 0, k;
+
+ /* Save a copy of the thread_list in case we execute detach
+ command. */
+ tp_array = xmalloc (sizeof (struct thread_info *) * tc);
+ make_cleanup (xfree, tp_array);
+ ta_cleanup.tp_array = tp_array;
+ ta_cleanup.count = tc;
+
+ ALL_THREADS (tp)
+ {
+ tp_array[i] = tp;
+ tp->refcount++;
+ i++;
+ }
+
+ make_cleanup (set_thread_refcount, &ta_cleanup);
+
+ for (k = 0; k != i; k++)
+ if (thread_alive (tp_array[k]))
+ {
+ switch_to_thread (tp_array[k]->ptid);
+ printf_filtered (_("\nThread %d (%s):\n"),
+ tp_array[k]->num,
+ target_pid_to_str (inferior_ptid));
+ execute_command (cmd, from_tty);
+
+ /* Restore exact command used previously. */
+ strcpy (cmd, saved_cmd);
+ }
+ }
do_cleanups (old_chain);
}
{
struct thread_info *tp;
int start;
- char *p = tidlist;
start = get_number_or_range (&state);
if (ptid_equal (inferior_ptid, null_ptid))
error (_("No thread selected"));
- while (arg && isspace (*arg))
- ++arg;
+ arg = skip_spaces (arg);
info = inferior_thread ();
xfree (info->name);
else
{
ui_out_text (uiout, "\n");
- print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC);
+ print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1);
}
/* Since the current thread may have changed, see if there is any
no thread is selected, or no threads exist. */
static struct value *
-thread_id_make_value (struct gdbarch *gdbarch, struct internalvar *var)
+thread_id_make_value (struct gdbarch *gdbarch, struct internalvar *var,
+ void *ignore)
{
struct thread_info *tp = find_thread_ptid (inferior_ptid);
/* Commands with a prefix of `thread'. */
struct cmd_list_element *thread_cmd_list = NULL;
+/* Implementation of `thread' variable. */
+
+static const struct internalvar_funcs thread_funcs =
+{
+ thread_id_make_value,
+ NULL,
+ NULL
+};
+
void
_initialize_thread (void)
{
show_print_thread_events,
&setprintlist, &showprintlist);
- create_internalvar_type_lazy ("_thread", thread_id_make_value);
+ create_internalvar_type_lazy ("_thread", &thread_funcs, NULL);
}
projects / deliverable / binutils-gdb.git / blobdiff