X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdbserver%2Finferiors.c;h=3c171a179ec66a1eb0003aafefc8a3e454410a66;hb=6afd337d1a1a789b71d77b157529c08250eb9093;hp=bebec9a22b8688eba529dc81f02012a1058b84c9;hpb=0fb0cc7590113e9b459dfcc48dc71c9d419d9580;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c
index bebec9a22b..3c171a179e 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, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2002-2017 Free Software Foundation, Inc.
Contributed by MontaVista Software.
@@ -18,26 +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 thread_info
-{
- struct inferior_list_entry entry;
- void *target_data;
- void *regcache_data;
- unsigned int gdb_id;
-};
-
+struct inferior_list all_processes;
struct inferior_list all_threads;
-struct inferior_list all_dlls;
-int dlls_changed;
-struct thread_info *current_inferior;
+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,
@@ -51,6 +41,8 @@ add_inferior_to_list (struct inferior_list *list,
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 *))
@@ -65,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)
@@ -92,86 +102,133 @@ remove_inferior (struct inferior_list *list,
list->tail = *cur;
}
-void
-add_thread (unsigned long thread_id, void *target_data, unsigned int gdb_id)
+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 ());
- new_thread->gdb_id = gdb_id;
+
+ return new_thread;
}
-unsigned int
-thread_id_to_gdb_id (unsigned long thread_id)
+ptid_t
+thread_to_gdb_id (struct thread_info *thread)
{
- struct inferior_list_entry *inf = all_threads.head;
+ return thread->entry.id;
+}
- while (inf != NULL)
- {
- struct thread_info *thread = get_thread (inf);
- if (inf->id == thread_id)
- return thread->gdb_id;
- inf = inf->next;
- }
+/* Wrapper around get_first_inferior to return a struct thread_info *. */
- return 0;
+struct thread_info *
+get_first_thread (void)
+{
+ return (struct thread_info *) get_first_inferior (&all_threads);
}
-unsigned int
-thread_to_gdb_id (struct thread_info *thread)
+struct thread_info *
+find_thread_ptid (ptid_t ptid)
+{
+ 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 thread->gdb_id;
+ 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 *
-gdb_id_to_thread (unsigned int gdb_id)
+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 (thread->gdb_id == gdb_id)
- return thread;
- inf = inf->next;
- }
+ entry = find_inferior (&all_threads, thread_of_pid, &pid);
- return NULL;
+ return (struct thread_info *) entry;
}
-unsigned long
-gdb_id_to_thread_id (unsigned int gdb_id)
+ptid_t
+gdb_id_to_thread_id (ptid_t gdb_id)
{
- struct thread_info *thread = gdb_id_to_thread (gdb_id);
+ struct thread_info *thread = find_thread_ptid (gdb_id);
- return thread ? thread->entry.id : 0;
+ return thread ? thread->entry.id : null_ptid;
}
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)
+ 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)
@@ -180,22 +237,70 @@ find_inferior (struct inferior_list *list,
while (inf != NULL)
{
+ struct inferior_list_entry *next;
+
+ next = inf->next;
if ((*func) (inf, arg))
return inf;
- inf = inf->next;
+ 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, unsigned long id)
+find_inferior_id (struct inferior_list *list, ptid_t id)
{
struct inferior_list_entry *inf = list->head;
while (inf != NULL)
{
- if (inf->id == id)
+ if (ptid_equal (inf->id, id))
return inf;
inf = inf->next;
}
@@ -204,133 +309,165 @@ find_inferior_id (struct inferior_list *list, unsigned long id)
}
void *
-inferior_target_data (struct thread_info *inferior)
+thread_target_data (struct thread_info *thread)
+{
+ return thread->target_data;
+}
+
+struct regcache *
+thread_regcache_data (struct thread_info *thread)
{
- return inferior->target_data;
+ return thread->regcache_data;
}
void
-set_inferior_target_data (struct thread_info *inferior, void *data)
+set_thread_regcache_data (struct thread_info *thread, struct regcache *data)
{
- inferior->target_data = data;
+ thread->regcache_data = data;
}
-void *
-inferior_regcache_data (struct thread_info *inferior)
+/* Return true if LIST has exactly one entry. */
+
+int
+one_inferior_p (struct inferior_list *list)
{
- return inferior->regcache_data;
+ return list->head != NULL && list->head == list->tail;
}
+/* Reset head,tail of LIST, assuming all entries have already been freed. */
+
void
-set_inferior_regcache_data (struct thread_info *inferior, void *data)
+clear_inferior_list (struct inferior_list *list)
{
- inferior->regcache_data = data;
+ list->head = NULL;
+ list->tail = NULL;
}
-static void
-free_one_dll (struct inferior_list_entry *inf)
+void
+clear_inferiors (void)
{
- struct dll_info *dll = get_dll (inf);
- if (dll->name != NULL)
- free (dll->name);
- free (dll);
-}
+ for_each_inferior (&all_threads, free_one_thread);
+ clear_inferior_list (&all_threads);
-/* 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. */
+ clear_dlls ();
-static int
-match_dll (struct inferior_list_entry *inf, void *arg)
+ current_thread = NULL;
+}
+
+struct process_info *
+add_process (int pid, int attached)
{
- struct dll_info *iter = (void *) inf;
- struct dll_info *key = arg;
+ struct process_info *process = XCNEW (struct process_info);
- 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;
+ process->entry.id = pid_to_ptid (pid);
+ process->attached = attached;
- return 0;
+ add_inferior_to_list (&all_processes, &process->entry);
+
+ return process;
}
-/* Record a newly loaded DLL at BASE_ADDR. */
+/* Remove a process from the common process list and free the memory
+ allocated for it.
+ The caller is responsible for freeing private data first. */
void
-loaded_dll (const char *name, CORE_ADDR base_addr)
+remove_process (struct process_info *process)
{
- struct dll_info *new_dll = xmalloc (sizeof (*new_dll));
- memset (new_dll, 0, sizeof (*new_dll));
+ clear_symbol_cache (&process->symbol_cache);
+ free_all_breakpoints (process);
+ gdb_assert (find_thread_process (process) == NULL);
+ remove_inferior (&all_processes, &process->entry);
+ VEC_free (int, process->syscalls_to_catch);
+ free (process);
+}
- new_dll->entry.id = -1;
+struct process_info *
+find_process_pid (int pid)
+{
+ return (struct process_info *)
+ find_inferior_id (&all_processes, pid_to_ptid (pid));
+}
- new_dll->name = xstrdup (name);
- new_dll->base_addr = base_addr;
+/* Wrapper around get_first_inferior to return a struct process_info *. */
- add_inferior_to_list (&all_dlls, &new_dll->entry);
- dlls_changed = 1;
+struct process_info *
+get_first_process (void)
+{
+ return (struct process_info *) get_first_inferior (&all_processes);
}
-/* Record that the DLL with NAME and BASE_ADDR has been unloaded. */
+/* Return non-zero if INF, a struct process_info, was started by us,
+ i.e. not attached to. */
-void
-unloaded_dll (const char *name, CORE_ADDR base_addr)
+static int
+started_inferior_callback (struct inferior_list_entry *entry, void *args)
{
- struct dll_info *dll;
- struct dll_info key_dll;
+ struct process_info *process = (struct process_info *) entry;
+
+ return ! process->attached;
+}
- /* Be careful not to put the key DLL in any list. */
- key_dll.name = (char *) name;
- key_dll.base_addr = base_addr;
+/* Return non-zero if there are any inferiors that we have created
+ (as opposed to attached-to). */
- dll = (void *) find_inferior (&all_dlls, match_dll, &key_dll);
- remove_inferior (&all_dlls, &dll->entry);
- free_one_dll (&dll->entry);
- dlls_changed = 1;
+int
+have_started_inferiors_p (void)
+{
+ return (find_inferior (&all_processes, started_inferior_callback, NULL)
+ != NULL);
}
-#define clear_list(LIST) \
- do { (LIST)->head = (LIST)->tail = NULL; } while (0)
+/* Return non-zero if INF, a struct process_info, was attached to. */
-void
-clear_inferiors (void)
+static int
+attached_inferior_callback (struct inferior_list_entry *entry, void *args)
{
- for_each_inferior (&all_threads, free_one_thread);
- for_each_inferior (&all_dlls, free_one_dll);
+ struct process_info *process = (struct process_info *) entry;
+
+ return process->attached;
+}
- clear_list (&all_threads);
- clear_list (&all_dlls);
+/* Return non-zero if there are any inferiors that we have attached to. */
- current_inferior = NULL;
+int
+have_attached_inferiors_p (void)
+{
+ return (find_inferior (&all_processes, attached_inferior_callback, NULL)
+ != NULL);
}
-/* Two utility functions for a truly degenerate inferior_list: a simple
- PID listing. */
+struct process_info *
+get_thread_process (const struct thread_info *thread)
+{
+ int pid = ptid_get_pid (thread->entry.id);
+ return find_process_pid (pid);
+}
-void
-add_pid_to_list (struct inferior_list *list, unsigned long pid)
+struct process_info *
+current_process (void)
{
- struct inferior_list_entry *new_entry;
+ gdb_assert (current_thread != NULL);
+ return get_thread_process (current_thread);
+}
- new_entry = xmalloc (sizeof (struct inferior_list_entry));
- new_entry->id = pid;
- add_inferior_to_list (list, new_entry);
+static void
+do_restore_current_thread_cleanup (void *arg)
+{
+ current_thread = (struct thread_info *) arg;
}
-int
-pull_pid_from_list (struct inferior_list *list, unsigned long pid)
+struct cleanup *
+make_cleanup_restore_current_thread (void)
{
- struct inferior_list_entry *new_entry;
+ return make_cleanup (do_restore_current_thread_cleanup, current_thread);
+}
- new_entry = find_inferior_id (list, pid);
- if (new_entry == NULL)
- return 0;
- else
- {
- remove_inferior (list, new_entry);
- free (new_entry);
- return 1;
- }
+/* See common/common-gdbthread.h. */
+
+void
+switch_to_thread (ptid_t ptid)
+{
+ if (!ptid_equal (ptid, minus_one_ptid))
+ current_thread = find_thread_ptid (ptid);
}