diff options
Diffstat (limited to 'gdb/linux-thread-db.c')
| -rw-r--r-- | gdb/linux-thread-db.c | 66 |
1 files changed, 20 insertions, 46 deletions
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c index eced854..d3371d0 100644 --- a/gdb/linux-thread-db.c +++ b/gdb/linux-thread-db.c @@ -80,9 +80,6 @@ /* This module's target vector. */ static struct target_ops thread_db_ops; -/* The target vector that we call for things this module can't handle. */ -static struct target_ops *target_beneath; - /* Non-zero if we're using this module's target vector. */ static int using_thread_db; @@ -379,12 +376,6 @@ thread_db_attach_lwp (ptid_t ptid) return 1; } -void -thread_db_init (struct target_ops *target) -{ - target_beneath = target; -} - static void * verbose_dlsym (void *handle, const char *name) { @@ -782,6 +773,8 @@ detach_thread (ptid_t ptid) static void thread_db_detach (struct target_ops *ops, char *args, int from_tty) { + struct target_ops *target_beneath = find_target_beneath (ops); + disable_thread_event_reporting (); /* Forget about the child's process ID. We shouldn't need it @@ -885,9 +878,12 @@ check_event (ptid_t ptid) } static ptid_t -thread_db_wait (ptid_t ptid, struct target_waitstatus *ourstatus) +thread_db_wait (struct target_ops *ops, + ptid_t ptid, struct target_waitstatus *ourstatus) { - ptid = target_beneath->to_wait (ptid, ourstatus); + struct target_ops *beneath = find_target_beneath (ops); + + ptid = beneath->to_wait (beneath, ptid, ourstatus); if (ourstatus->kind == TARGET_WAITKIND_IGNORE) return ptid; @@ -934,6 +930,8 @@ thread_db_wait (ptid_t ptid, struct target_waitstatus *ourstatus) static void thread_db_mourn_inferior (struct target_ops *ops) { + struct target_ops *target_beneath = find_target_beneath (ops); + /* Forget about the child's process ID. We shouldn't need it anymore. */ proc_handle.pid = 0; @@ -950,31 +948,6 @@ thread_db_mourn_inferior (struct target_ops *ops) } static int -thread_db_can_async_p (void) -{ - return target_beneath->to_can_async_p (); -} - -static int -thread_db_is_async_p (void) -{ - return target_beneath->to_is_async_p (); -} - -static void -thread_db_async (void (*callback) (enum inferior_event_type event_type, - void *context), void *context) -{ - return target_beneath->to_async (callback, context); -} - -static int -thread_db_async_mask (int mask) -{ - return target_beneath->to_async_mask (mask); -} - -static int find_new_threads_callback (const td_thrhandle_t *th_p, void *data) { td_thrinfo_t ti; @@ -1045,9 +1018,10 @@ thread_db_find_new_threads (void) } static char * -thread_db_pid_to_str (ptid_t ptid) +thread_db_pid_to_str (struct target_ops *ops, ptid_t ptid) { struct thread_info *thread_info = find_thread_pid (ptid); + struct target_ops *beneath; if (thread_info != NULL && thread_info->private != NULL) { @@ -1062,8 +1036,9 @@ thread_db_pid_to_str (ptid_t ptid) return buf; } - if (target_beneath->to_pid_to_str (ptid)) - return target_beneath->to_pid_to_str (ptid); + beneath = find_target_beneath (ops); + if (beneath->to_pid_to_str (beneath, ptid)) + return beneath->to_pid_to_str (beneath, ptid); return normal_pid_to_str (ptid); } @@ -1087,11 +1062,13 @@ thread_db_extra_thread_info (struct thread_info *info) is stored at OFFSET within the thread local storage for thread PTID. */ static CORE_ADDR -thread_db_get_thread_local_address (ptid_t ptid, +thread_db_get_thread_local_address (struct target_ops *ops, + ptid_t ptid, CORE_ADDR lm, CORE_ADDR offset) { struct thread_info *thread_info; + struct target_ops *beneath; /* If we have not discovered any threads yet, check now. */ if (!have_threads ()) @@ -1141,8 +1118,9 @@ thread_db_get_thread_local_address (ptid_t ptid, : (CORE_ADDR) (uintptr_t) address); } - if (target_beneath->to_get_thread_local_address) - return target_beneath->to_get_thread_local_address (ptid, lm, offset); + beneath = find_target_beneath (ops); + if (beneath->to_get_thread_local_address) + return beneath->to_get_thread_local_address (beneath, ptid, lm, offset); else throw_error (TLS_GENERIC_ERROR, _("TLS not supported on this target")); @@ -1193,10 +1171,6 @@ init_thread_db_ops (void) thread_db_ops.to_get_thread_local_address = thread_db_get_thread_local_address; thread_db_ops.to_extra_thread_info = thread_db_extra_thread_info; - thread_db_ops.to_can_async_p = thread_db_can_async_p; - thread_db_ops.to_is_async_p = thread_db_is_async_p; - thread_db_ops.to_async = thread_db_async; - thread_db_ops.to_async_mask = thread_db_async_mask; thread_db_ops.to_get_ada_task_ptid = thread_db_get_ada_task_ptid; thread_db_ops.to_magic = OPS_MAGIC; } |