X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fthread.c;h=25538d7d43816c027ee5a5559a45ee6d652458d5;hb=48e6666a0d550f290ea174682c78b0d62a027076;hp=22d8b236b95bd1e10e39252a42242ff82fc02d00;hpb=9addecb9fb140b0f92a0f06ee90809768bd16eae;p=platform%2Fupstream%2Fbinutils.git diff --git a/gdb/thread.c b/gdb/thread.c index 22d8b23..25538d7 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -1,7 +1,6 @@ /* Multi-process/thread control for GDB, the GNU debugger. - Copyright (C) 1986-1988, 1993-2004, 2007-2012 Free Software - Foundation, Inc. + Copyright (C) 1986-2014 Free Software Foundation, Inc. Contributed by Lynx Real-Time Systems, Inc. Los Gatos, CA. @@ -28,12 +27,11 @@ #include "value.h" #include "target.h" #include "gdbthread.h" -#include "exceptions.h" #include "command.h" #include "gdbcmd.h" #include "regcache.h" #include "gdb.h" -#include "gdb_string.h" +#include "btrace.h" #include #include @@ -54,9 +52,16 @@ void _initialize_thread (void); /* Prototypes for local functions. */ -static struct thread_info *thread_list = NULL; +struct thread_info *thread_list = NULL; static int highest_thread_num; +/* True if any thread is, or may be executing. We need to track this + separately because until we fully sync the thread list, we won't + know whether the target is fully stopped, even if we see stop + events for all known threads, because any of those threads may have + spawned new threads we haven't heard of yet. */ +static int threads_executing; + static void thread_command (char *tidstr, int from_tty); static void thread_apply_all_command (char *, int); static int thread_alive (struct thread_info *); @@ -65,6 +70,19 @@ static void thread_apply_command (char *, int); 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) { @@ -113,12 +131,14 @@ clear_thread_inferior_resources (struct thread_info *tp) 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 @@ -153,6 +173,7 @@ init_thread_list (void) } thread_list = NULL; + threads_executing = 0; } /* Allocate a new thread with target id PTID and add it to the thread @@ -452,7 +473,13 @@ any_thread_of_process (int pid) { struct thread_info *tp; - for (tp = thread_list; tp; tp = tp->next) + gdb_assert (pid != 0); + + /* Prefer the current thread. */ + if (ptid_get_pid (inferior_ptid) == pid) + return inferior_thread (); + + ALL_NON_EXITED_THREADS (tp) if (ptid_get_pid (tp->ptid) == pid) return tp; @@ -462,18 +489,40 @@ any_thread_of_process (int pid) struct thread_info * any_live_thread_of_process (int pid) { + struct thread_info *curr_tp = NULL; struct thread_info *tp; struct thread_info *tp_executing = NULL; - for (tp = thread_list; tp; tp = tp->next) - if (tp->state != THREAD_EXITED && ptid_get_pid (tp->ptid) == pid) + gdb_assert (pid != 0); + + /* Prefer the current thread if it's not executing. */ + if (ptid_get_pid (inferior_ptid) == pid) + { + /* If the current thread is dead, forget it. If it's not + executing, use it. Otherwise, still choose it (below), but + only if no other non-executing thread is found. */ + curr_tp = inferior_thread (); + if (curr_tp->state == THREAD_EXITED) + curr_tp = NULL; + else if (!curr_tp->executing) + return curr_tp; + } + + ALL_NON_EXITED_THREADS (tp) + if (ptid_get_pid (tp->ptid) == pid) { - if (tp->executing) - tp_executing = tp; - else + if (!tp->executing) return tp; + + tp_executing = tp; } + /* If both the current thread and all live threads are executing, + prefer the current thread. */ + if (curr_tp != NULL) + return curr_tp; + + /* Otherwise, just return an executing thread, if any. */ return tp_executing; } @@ -633,18 +682,6 @@ is_running (ptid_t ptid) } 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; @@ -672,6 +709,22 @@ set_executing (ptid_t ptid, int executing) gdb_assert (tp); tp->executing = executing; } + + /* It only takes one running thread to spawn more threads.*/ + if (executing) + threads_executing = 1; + /* Only clear the flag if the caller is telling us everything is + stopped. */ + else if (ptid_equal (minus_one_ptid, ptid)) + threads_executing = 0; +} + +/* See gdbthread.h. */ + +int +threads_are_executing (void) +{ + return threads_executing; } void @@ -748,6 +801,13 @@ finish_thread_state_cleanup (void *arg) 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. @@ -788,7 +848,7 @@ print_thread_info (struct ui_out *uiout, char *requested_threads, int pid) 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) @@ -825,7 +885,7 @@ print_thread_info (struct ui_out *uiout, char *requested_threads, int pid) 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")); @@ -907,7 +967,7 @@ print_thread_info (struct ui_out *uiout, char *requested_threads, int pid) print_stack_frame (get_selected_frame (NULL), /* For MI output, print frame level. */ ui_out_is_mi_like_p (uiout), - LOCATION); + LOCATION, 0); } if (ui_out_is_mi_like_p (uiout)) @@ -987,7 +1047,6 @@ switch_to_thread (ptid_t ptid) inferior_ptid = ptid; reinit_frame_cache (); - registers_changed (); /* We don't check for is_stopped, because we're called at times while in the TARGET_RUNNING state, e.g., while handling an @@ -1056,12 +1115,12 @@ restore_selected_frame (struct frame_id a_frame_id, int frame_level) 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); } } @@ -1124,6 +1183,18 @@ restore_current_thread_cleanup_dtor (void *arg) 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) { @@ -1179,9 +1250,10 @@ make_cleanup_restore_current_thread (void) 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")); @@ -1194,17 +1266,43 @@ thread_apply_all_command (char *cmd, int from_tty) 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_NON_EXITED_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); } @@ -1235,7 +1333,6 @@ thread_apply_command (char *tidlist, int from_tty) { struct thread_info *tp; int start; - char *p = tidlist; start = get_number_or_range (&state); @@ -1303,8 +1400,7 @@ thread_name_command (char *arg, int from_tty) 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); @@ -1409,7 +1505,7 @@ do_captured_thread_select (struct ui_out *uiout, void *tidstr) 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 @@ -1428,18 +1524,39 @@ gdb_thread_select (struct ui_out *uiout, char *tidstr, char **error_message) return GDB_RC_OK; } +/* Update the 'threads_executing' global based on the threads we know + about right now. */ + +static void +update_threads_executing (void) +{ + struct thread_info *tp; + + threads_executing = 0; + ALL_NON_EXITED_THREADS (tp) + { + if (tp->executing) + { + threads_executing = 1; + break; + } + } +} + void update_thread_list (void) { prune_threads (); target_find_new_threads (); + update_threads_executing (); } /* Return a new value for the selected thread's id. Return a value of 0 if no thread is selected, or no threads exist. */ 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); @@ -1450,6 +1567,15 @@ thread_id_make_value (struct gdbarch *gdbarch, struct internalvar *var) /* 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) { @@ -1495,5 +1621,5 @@ Show printing of thread events (such as thread start and exit)."), NULL, show_print_thread_events, &setprintlist, &showprintlist); - create_internalvar_type_lazy ("_thread", thread_id_make_value); + create_internalvar_type_lazy ("_thread", &thread_funcs, NULL); }