X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdbserver%2Finferiors.c;h=3c171a179ec66a1eb0003aafefc8a3e454410a66;hb=6afd337d1a1a789b71d77b157529c08250eb9093;hp=37df792834308085b6cb342300e0da95e42816bc;hpb=d50171e439384d0185e81db4e2e3016d8c05d27b;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c
index 37df792834..3c171a179e 100644
--- a/gdb/gdbserver/inferiors.c
+++ b/gdb/gdbserver/inferiors.c
@@ -1,6 +1,5 @@
/* Inferior process information for the remote server for GDB.
- Copyright (C) 2002, 2005, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 2002-2017 Free Software Foundation, Inc.
Contributed by MontaVista Software.
@@ -19,94 +18,16 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-#include
-
#include "server.h"
+#include "gdbthread.h"
+#include "dll.h"
struct inferior_list all_processes;
struct inferior_list all_threads;
-struct inferior_list all_dlls;
-int dlls_changed;
-
-struct thread_info *current_inferior;
-
-
-/* Oft used ptids */
-ptid_t null_ptid;
-ptid_t minus_one_ptid;
-
-/* Create a ptid given the necessary PID, LWP, and TID components. */
-
-ptid_t
-ptid_build (int pid, long lwp, long tid)
-{
- ptid_t ptid;
-
- ptid.pid = pid;
- ptid.lwp = lwp;
- ptid.tid = tid;
- return ptid;
-}
-
-/* Create a ptid from just a pid. */
-
-ptid_t
-pid_to_ptid (int pid)
-{
- return ptid_build (pid, 0, 0);
-}
-
-/* Fetch the pid (process id) component from a ptid. */
-
-int
-ptid_get_pid (ptid_t ptid)
-{
- return ptid.pid;
-}
-
-/* Fetch the lwp (lightweight process) component from a ptid. */
-
-long
-ptid_get_lwp (ptid_t ptid)
-{
- return ptid.lwp;
-}
-
-/* Fetch the tid (thread id) component from a ptid. */
-
-long
-ptid_get_tid (ptid_t ptid)
-{
- return ptid.tid;
-}
-
-/* ptid_equal() is used to test equality of two ptids. */
-int
-ptid_equal (ptid_t ptid1, ptid_t ptid2)
-{
- return (ptid1.pid == ptid2.pid
- && ptid1.lwp == ptid2.lwp
- && ptid1.tid == ptid2.tid);
-}
-
-/* Return true if this ptid represents a process. */
-
-int
-ptid_is_pid (ptid_t ptid)
-{
- if (ptid_equal (minus_one_ptid, ptid))
- return 0;
- if (ptid_equal (null_ptid, ptid))
- return 0;
-
- return (ptid_get_pid (ptid) != 0
- && ptid_get_lwp (ptid) == 0
- && ptid_get_tid (ptid) == 0);
-}
+struct thread_info *current_thread;
#define get_thread(inf) ((struct thread_info *)(inf))
-#define get_dll(inf) ((struct dll_info *)(inf))
void
add_inferior_to_list (struct inferior_list *list,
@@ -136,6 +57,24 @@ for_each_inferior (struct inferior_list *list,
}
}
+/* 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)
@@ -163,59 +102,87 @@ remove_inferior (struct inferior_list *list,
list->tail = *cur;
}
-void
+struct thread_info *
add_thread (ptid_t thread_id, void *target_data)
{
- struct thread_info *new_thread = xmalloc (sizeof (*new_thread));
-
- memset (new_thread, 0, sizeof (*new_thread));
+ struct thread_info *new_thread = XCNEW (struct thread_info);
new_thread->entry.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);
+ add_inferior_to_list (&all_threads, &new_thread->entry);
- if (current_inferior == NULL)
- current_inferior = new_thread;
+ if (current_thread == NULL)
+ current_thread = new_thread;
new_thread->target_data = target_data;
- set_inferior_regcache_data (new_thread, new_register_cache ());
+
+ return new_thread;
}
ptid_t
-thread_id_to_gdb_id (ptid_t thread_id)
+thread_to_gdb_id (struct thread_info *thread)
{
- struct inferior_list_entry *inf = all_threads.head;
+ return thread->entry.id;
+}
- while (inf != NULL)
- {
- if (ptid_equal (inf->id, thread_id))
- return thread_id;
- inf = inf->next;
- }
+/* Wrapper around get_first_inferior to return a struct thread_info *. */
- return null_ptid;
+struct thread_info *
+get_first_thread (void)
+{
+ return (struct thread_info *) get_first_inferior (&all_threads);
}
-ptid_t
-thread_to_gdb_id (struct thread_info *thread)
+struct thread_info *
+find_thread_ptid (ptid_t ptid)
{
- return thread->entry.id;
+ return (struct thread_info *) find_inferior_id (&all_threads, ptid);
+}
+
+/* Predicate function for matching thread entry's pid to the given
+ pid value passed by address in ARGS. */
+
+static int
+thread_pid_matches_callback (struct inferior_list_entry *entry, void *args)
+{
+ return (ptid_get_pid (entry->id) == *(pid_t *)args);
+}
+
+/* Find a thread associated with the given PROCESS, or NULL if no
+ such thread exists. */
+
+static struct thread_info *
+find_thread_process (const struct process_info *const process)
+{
+ pid_t pid = ptid_get_pid (ptid_of (process));
+
+ return (struct thread_info *)
+ find_inferior (&all_threads, thread_pid_matches_callback, &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_thread_ptid (ptid_t ptid)
+find_any_thread_of_pid (int pid)
{
- struct inferior_list_entry *inf = all_threads.head;
+ struct inferior_list_entry *entry;
- while (inf != NULL)
- {
- struct thread_info *thread = get_thread (inf);
- if (ptid_equal (thread->entry.id, ptid))
- return thread;
- inf = inf->next;
- }
+ entry = find_inferior (&all_threads, thread_of_pid, &pid);
- return NULL;
+ return (struct thread_info *) entry;
}
ptid_t
@@ -230,15 +197,33 @@ static void
free_one_thread (struct inferior_list_entry *inf)
{
struct thread_info *thread = get_thread (inf);
- free_register_cache (inferior_regcache_data (thread));
+ free_register_cache (thread_regcache_data (thread));
free (thread);
}
void
remove_thread (struct thread_info *thread)
{
+ if (thread->btrace != NULL)
+ 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);
+ 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)
@@ -263,180 +248,121 @@ find_inferior (struct inferior_list *list,
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_id (struct inferior_list *list, ptid_t id)
+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)
{
- if (ptid_equal (inf->id, id))
+ 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 = inf->next;
+ inf = next;
}
+ gdb_assert_not_reached ("failed to find an inferior in random.");
return NULL;
}
-void *
-inferior_target_data (struct thread_info *inferior)
+struct inferior_list_entry *
+find_inferior_id (struct inferior_list *list, ptid_t id)
{
- return inferior->target_data;
-}
+ struct inferior_list_entry *inf = list->head;
-void
-set_inferior_target_data (struct thread_info *inferior, void *data)
-{
- inferior->target_data = data;
-}
+ while (inf != NULL)
+ {
+ if (ptid_equal (inf->id, id))
+ return inf;
+ inf = inf->next;
+ }
-void *
-inferior_regcache_data (struct thread_info *inferior)
-{
- return inferior->regcache_data;
+ return NULL;
}
-void
-set_inferior_regcache_data (struct thread_info *inferior, void *data)
+void *
+thread_target_data (struct thread_info *thread)
{
- inferior->regcache_data = data;
+ return thread->target_data;
}
-static void
-free_one_dll (struct inferior_list_entry *inf)
+struct regcache *
+thread_regcache_data (struct thread_info *thread)
{
- struct dll_info *dll = get_dll (inf);
- if (dll->name != NULL)
- free (dll->name);
- free (dll);
+ return thread->regcache_data;
}
-/* Find a DLL with the same name and/or base address. A NULL name in
- the key is ignored; so is an all-ones base address. */
-
-static int
-match_dll (struct inferior_list_entry *inf, void *arg)
+void
+set_thread_regcache_data (struct thread_info *thread, struct regcache *data)
{
- struct dll_info *iter = (void *) inf;
- struct dll_info *key = arg;
-
- if (key->base_addr != ~(CORE_ADDR) 0
- && iter->base_addr == key->base_addr)
- return 1;
- else if (key->name != NULL
- && iter->name != NULL
- && strcmp (key->name, iter->name) == 0)
- return 1;
-
- return 0;
+ thread->regcache_data = data;
}
-/* Record a newly loaded DLL at BASE_ADDR. */
+/* Return true if LIST has exactly one entry. */
-void
-loaded_dll (const char *name, CORE_ADDR base_addr)
+int
+one_inferior_p (struct inferior_list *list)
{
- struct dll_info *new_dll = xmalloc (sizeof (*new_dll));
- memset (new_dll, 0, sizeof (*new_dll));
-
- new_dll->entry.id = minus_one_ptid;
-
- new_dll->name = xstrdup (name);
- new_dll->base_addr = base_addr;
-
- add_inferior_to_list (&all_dlls, &new_dll->entry);
- dlls_changed = 1;
+ return list->head != NULL && list->head == list->tail;
}
-/* Record that the DLL with NAME and BASE_ADDR has been unloaded. */
+/* Reset head,tail of LIST, assuming all entries have already been freed. */
void
-unloaded_dll (const char *name, CORE_ADDR base_addr)
+clear_inferior_list (struct inferior_list *list)
{
- struct dll_info *dll;
- struct dll_info key_dll;
-
- /* Be careful not to put the key DLL in any list. */
- key_dll.name = (char *) name;
- key_dll.base_addr = base_addr;
-
- dll = (void *) find_inferior (&all_dlls, match_dll, &key_dll);
-
- if (dll == NULL)
- /* For some inferiors we might get unloaded_dll events without having
- a corresponding loaded_dll. In that case, the dll cannot be found
- in ALL_DLL, and there is nothing further for us to do.
-
- This has been observed when running 32bit executables on Windows64
- (i.e. through WOW64, the interface between the 32bits and 64bits
- worlds). In that case, the inferior always does some strange
- unloading of unnamed dll. */
- return;
- else
- {
- /* DLL has been found so remove the entry and free associated
- resources. */
- remove_inferior (&all_dlls, &dll->entry);
- free_one_dll (&dll->entry);
- dlls_changed = 1;
- }
+ list->head = NULL;
+ list->tail = NULL;
}
-#define clear_list(LIST) \
- do { (LIST)->head = (LIST)->tail = NULL; } while (0)
-
void
clear_inferiors (void)
{
for_each_inferior (&all_threads, free_one_thread);
- for_each_inferior (&all_dlls, free_one_dll);
-
- clear_list (&all_threads);
- clear_list (&all_dlls);
-
- current_inferior = NULL;
-}
-
-/* Two utility functions for a truly degenerate inferior_list: a simple
- PID listing. */
+ clear_inferior_list (&all_threads);
-void
-add_pid_to_list (struct inferior_list *list, unsigned long pid)
-{
- struct inferior_list_entry *new_entry;
-
- new_entry = xmalloc (sizeof (struct inferior_list_entry));
- new_entry->id = pid_to_ptid (pid);
- add_inferior_to_list (list, new_entry);
-}
-
-int
-pull_pid_from_list (struct inferior_list *list, unsigned long pid)
-{
- struct inferior_list_entry *new_entry;
+ clear_dlls ();
- new_entry = find_inferior_id (list, pid_to_ptid (pid));
- if (new_entry == NULL)
- return 0;
- else
- {
- remove_inferior (list, new_entry);
- free (new_entry);
- return 1;
- }
+ current_thread = NULL;
}
struct process_info *
add_process (int pid, int attached)
{
- struct process_info *process;
-
- process = xcalloc (1, sizeof (*process));
+ struct process_info *process = XCNEW (struct process_info);
- process->head.id = pid_to_ptid (pid);
+ process->entry.id = pid_to_ptid (pid);
process->attached = attached;
- add_inferior_to_list (&all_processes, &process->head);
+ add_inferior_to_list (&all_processes, &process->entry);
return process;
}
@@ -450,7 +376,9 @@ remove_process (struct process_info *process)
{
clear_symbol_cache (&process->symbol_cache);
free_all_breakpoints (process);
- remove_inferior (&all_processes, &process->head);
+ gdb_assert (find_thread_process (process) == NULL);
+ remove_inferior (&all_processes, &process->entry);
+ VEC_free (int, process->syscalls_to_catch);
free (process);
}
@@ -461,6 +389,14 @@ find_process_pid (int pid)
find_inferior_id (&all_processes, pid_to_ptid (pid));
}
+/* Wrapper around get_first_inferior to return a struct process_info *. */
+
+struct process_info *
+get_first_process (void)
+{
+ return (struct process_info *) get_first_inferior (&all_processes);
+}
+
/* Return non-zero if INF, a struct process_info, was started by us,
i.e. not attached to. */
@@ -502,7 +438,7 @@ have_attached_inferiors_p (void)
}
struct process_info *
-get_thread_process (struct thread_info *thread)
+get_thread_process (const struct thread_info *thread)
{
int pid = ptid_get_pid (thread->entry.id);
return find_process_pid (pid);
@@ -511,15 +447,27 @@ get_thread_process (struct thread_info *thread)
struct process_info *
current_process (void)
{
- if (current_inferior == NULL)
- fatal ("Current inferior requested, but current_inferior is NULL\n");
+ gdb_assert (current_thread != NULL);
+ return get_thread_process (current_thread);
+}
- return get_thread_process (current_inferior);
+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. */
+
void
-initialize_inferiors (void)
+switch_to_thread (ptid_t ptid)
{
- null_ptid = ptid_build (0, 0, 0);
- minus_one_ptid = ptid_build (-1, 0, 0);
+ if (!ptid_equal (ptid, minus_one_ptid))
+ current_thread = find_thread_ptid (ptid);
}