X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdbserver%2Finferiors.c;h=e35186bda14eb90a91fe897d59aa1f5199ca798f;hb=4c5aa8e0b1b4439f73ef1f82344e408b989f85df;hp=13ee8c97eba50dbd53f9dfa53fc760fc59746857;hpb=9179355e655d78cf44ffdfb432e134eabceaebab;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c index 13ee8c97eb..e35186bda1 100644 --- a/gdb/gdbserver/inferiors.c +++ b/gdb/gdbserver/inferiors.c @@ -1,5 +1,5 @@ /* Inferior process information for the remote server for GDB. - Copyright (C) 2002-2017 Free Software Foundation, Inc. + Copyright (C) 2002-2019 Free Software Foundation, Inc. Contributed by MontaVista Software. @@ -23,98 +23,23 @@ #include "dll.h" std::list all_processes; -struct inferior_list all_threads; +std::list all_threads; struct thread_info *current_thread; -#define get_thread(inf) ((struct thread_info *)(inf)) - /* The current working directory used to start the inferior. */ static const char *current_inferior_cwd = NULL; -void -add_inferior_to_list (struct inferior_list *list, - struct inferior_list_entry *new_inferior) -{ - new_inferior->next = NULL; - if (list->tail != NULL) - list->tail->next = new_inferior; - else - list->head = new_inferior; - list->tail = new_inferior; -} - -/* Invoke ACTION for each inferior in LIST. */ - -void -for_each_inferior (struct inferior_list *list, - void (*action) (struct inferior_list_entry *)) -{ - struct inferior_list_entry *cur = list->head, *next; - - while (cur != NULL) - { - next = cur->next; - (*action) (cur); - cur = next; - } -} - -/* Invoke ACTION for each inferior in LIST, passing DATA to ACTION. */ - -void -for_each_inferior_with_data (struct inferior_list *list, - void (*action) (struct inferior_list_entry *, - void *), - void *data) -{ - struct inferior_list_entry *cur = list->head, *next; - - while (cur != NULL) - { - next = cur->next; - (*action) (cur, data); - cur = next; - } -} - -void -remove_inferior (struct inferior_list *list, - struct inferior_list_entry *entry) -{ - struct inferior_list_entry **cur; - - if (list->head == entry) - { - list->head = entry->next; - if (list->tail == entry) - list->tail = list->head; - return; - } - - cur = &list->head; - while (*cur && (*cur)->next != entry) - cur = &(*cur)->next; - - if (*cur == NULL) - return; - - (*cur)->next = entry->next; - - if (list->tail == entry) - list->tail = *cur; -} - struct thread_info * add_thread (ptid_t thread_id, void *target_data) { struct thread_info *new_thread = XCNEW (struct thread_info); - new_thread->entry.id = thread_id; + new_thread->id = thread_id; new_thread->last_resume_kind = resume_continue; new_thread->last_status.kind = TARGET_WAITKIND_IGNORE; - add_inferior_to_list (&all_threads, &new_thread->entry); + all_threads.push_back (new_thread); if (current_thread == NULL) current_thread = new_thread; @@ -124,18 +49,23 @@ add_thread (ptid_t thread_id, void *target_data) return new_thread; } -/* Wrapper around get_first_inferior to return a struct thread_info *. */ +/* See gdbthread.h. */ struct thread_info * get_first_thread (void) { - return (struct thread_info *) get_first_inferior (&all_threads); + if (!all_threads.empty ()) + return all_threads.front (); + else + return NULL; } struct thread_info * find_thread_ptid (ptid_t ptid) { - return (struct thread_info *) find_inferior_id (&all_threads, ptid); + return find_thread ([&] (thread_info *thread) { + return thread->id == ptid; + }); } /* Find a thread associated with the given PROCESS, or NULL if no @@ -147,33 +77,19 @@ find_thread_process (const struct process_info *const process) return find_any_thread_of_pid (process->pid); } -/* Helper for find_any_thread_of_pid. Returns true if a thread - matches a PID. */ - -static int -thread_of_pid (struct inferior_list_entry *entry, void *pid_p) -{ - int pid = *(int *) pid_p; - - return (ptid_get_pid (entry->id) == pid); -} - /* See gdbthread.h. */ struct thread_info * find_any_thread_of_pid (int pid) { - struct inferior_list_entry *entry; - - entry = find_inferior (&all_threads, thread_of_pid, &pid); - - return (struct thread_info *) entry; + return find_thread (pid, [] (thread_info *thread) { + return true; + }); } static void -free_one_thread (struct inferior_list_entry *inf) +free_one_thread (thread_info *thread) { - struct thread_info *thread = get_thread (inf); free_register_cache (thread_regcache_data (thread)); free (thread); } @@ -185,106 +101,12 @@ remove_thread (struct thread_info *thread) target_disable_btrace (thread->btrace); discard_queued_stop_replies (ptid_of (thread)); - remove_inferior (&all_threads, (struct inferior_list_entry *) thread); - free_one_thread (&thread->entry); + all_threads.remove (thread); + free_one_thread (thread); if (current_thread == thread) current_thread = NULL; } -/* Return a pointer to the first inferior in LIST, or NULL if there isn't one. - This is for cases where the caller needs a thread, but doesn't care - which one. */ - -struct inferior_list_entry * -get_first_inferior (struct inferior_list *list) -{ - if (list->head != NULL) - return list->head; - return NULL; -} - -/* Find the first inferior_list_entry E in LIST for which FUNC (E, ARG) - returns non-zero. If no entry is found then return NULL. */ - -struct inferior_list_entry * -find_inferior (struct inferior_list *list, - int (*func) (struct inferior_list_entry *, void *), void *arg) -{ - struct inferior_list_entry *inf = list->head; - - while (inf != NULL) - { - struct inferior_list_entry *next; - - next = inf->next; - if ((*func) (inf, arg)) - return inf; - inf = next; - } - - return NULL; -} - -/* Find the random inferior_list_entry E in LIST for which FUNC (E, ARG) - returns non-zero. If no entry is found then return NULL. */ - -struct inferior_list_entry * -find_inferior_in_random (struct inferior_list *list, - int (*func) (struct inferior_list_entry *, void *), - void *arg) -{ - struct inferior_list_entry *inf = list->head; - int count = 0; - int random_selector; - - /* First count how many interesting entries we have. */ - while (inf != NULL) - { - struct inferior_list_entry *next; - - next = inf->next; - if ((*func) (inf, arg)) - count++; - inf = next; - } - - if (count == 0) - return NULL; - - /* Now randomly pick an entry out of those. */ - random_selector = (int) - ((count * (double) rand ()) / (RAND_MAX + 1.0)); - - inf = list->head; - while (inf != NULL) - { - struct inferior_list_entry *next; - - next = inf->next; - if ((*func) (inf, arg) && (random_selector-- == 0)) - return inf; - inf = next; - } - - gdb_assert_not_reached ("failed to find an inferior in random."); - return NULL; -} - -struct inferior_list_entry * -find_inferior_id (struct inferior_list *list, ptid_t id) -{ - struct inferior_list_entry *inf = list->head; - - while (inf != NULL) - { - if (ptid_equal (inf->id, id)) - return inf; - inf = inf->next; - } - - return NULL; -} - void * thread_target_data (struct thread_info *thread) { @@ -303,28 +125,11 @@ set_thread_regcache_data (struct thread_info *thread, struct regcache *data) thread->regcache_data = data; } -/* Return true if LIST has exactly one entry. */ - -int -one_inferior_p (struct inferior_list *list) -{ - return list->head != NULL && list->head == list->tail; -} - -/* Reset head,tail of LIST, assuming all entries have already been freed. */ - -void -clear_inferior_list (struct inferior_list *list) -{ - list->head = NULL; - list->tail = NULL; -} - void clear_inferiors (void) { - for_each_inferior (&all_threads, free_one_thread); - clear_inferior_list (&all_threads); + for_each_thread (free_one_thread); + all_threads.clear (); clear_dlls (); @@ -334,10 +139,7 @@ clear_inferiors (void) struct process_info * add_process (int pid, int attached) { - struct process_info *process = XCNEW (struct process_info); - - process->pid = pid; - process->attached = attached; + process_info *process = new process_info (pid, attached); all_processes.push_back (process); @@ -355,8 +157,7 @@ remove_process (struct process_info *process) free_all_breakpoints (process); gdb_assert (find_thread_process (process) == NULL); all_processes.remove (process); - VEC_free (int, process->syscalls_to_catch); - free (process); + delete process; } process_info * @@ -402,8 +203,7 @@ have_attached_inferiors_p (void) struct process_info * get_thread_process (const struct thread_info *thread) { - int pid = ptid_get_pid (thread->entry.id); - return find_process_pid (pid); + return find_process_pid (thread->id.pid ()); } struct process_info * @@ -413,19 +213,7 @@ current_process (void) return get_thread_process (current_thread); } -static void -do_restore_current_thread_cleanup (void *arg) -{ - current_thread = (struct thread_info *) arg; -} - -struct cleanup * -make_cleanup_restore_current_thread (void) -{ - return make_cleanup (do_restore_current_thread_cleanup, current_thread); -} - -/* See common/common-gdbthread.h. */ +/* See gdbsupport/common-gdbthread.h. */ void switch_to_thread (ptid_t ptid) @@ -434,7 +222,7 @@ switch_to_thread (ptid_t ptid) current_thread = find_thread_ptid (ptid); } -/* See common/common-inferior.h. */ +/* See gdbsupport/common-inferior.h. */ const char * get_inferior_cwd () @@ -442,7 +230,7 @@ get_inferior_cwd () return current_inferior_cwd; } -/* See common/common-inferior.h. */ +/* See gdbsupport/common-inferior.h. */ void set_inferior_cwd (const char *cwd)