diff options
| author | Daniel Jacobowitz <drow@false.org> | 2004-12-08 15:10:30 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2004-12-08 15:10:30 +0000 |
| commit | 1bac0d4d5f9c135bd035b160781556ca47a2092c (patch) | |
| tree | 649fc06b1f7ada71c28190ddc72f5a7670019798 | |
| parent | 254ce0a11f382cf2dd627a6e5b32f6bad50abc96 (diff) | |
| download | gdb-1bac0d4d5f9c135bd035b160781556ca47a2092c.zip gdb-1bac0d4d5f9c135bd035b160781556ca47a2092c.tar.gz gdb-1bac0d4d5f9c135bd035b160781556ca47a2092c.tar.bz2 | |
* linux-thread-db.c (BUILD_THREAD): Delete.
(thread_get_info_callback): Include LWP ID in thread ID.
(thread_from_lwp, check_event, find_new_threads_callback): Likewise.
(lwp_from_thread): Use the LWP ID from the thread ID.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/linux-thread-db.c | 21 |
2 files changed, 13 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e1649e3..1930608 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2004-12-08 Daniel Jacobowitz <dan@debian.org> + + * linux-thread-db.c (BUILD_THREAD): Delete. + (thread_get_info_callback): Include LWP ID in thread ID. + (thread_from_lwp, check_event, find_new_threads_callback): Likewise. + (lwp_from_thread): Use the LWP ID from the thread ID. + 2004-12-07 Randolph Chung <tausq@debian.org> * hppa-tdep.c (hppa_frame_prev_register_helper): Zero out the entire diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c index 65d9fd5..bf8927d 100644 --- a/gdb/linux-thread-db.c +++ b/gdb/linux-thread-db.c @@ -143,7 +143,6 @@ static void detach_thread (ptid_t ptid, int verbose); #define is_thread(ptid) (GET_THREAD (ptid) != 0) #define BUILD_LWP(lwp, pid) ptid_build (pid, lwp, 0) -#define BUILD_THREAD(tid, pid) ptid_build (pid, 0, tid) /* Use "struct private_thread_info" to cache thread state. This is @@ -267,7 +266,7 @@ thread_get_info_callback (const td_thrhandle_t *thp, void *infop) thread_db_err_str (err)); /* Fill the cache. */ - thread_ptid = BUILD_THREAD (ti.ti_tid, GET_PID (inferior_ptid)); + thread_ptid = ptid_build (GET_PID (inferior_ptid), ti.ti_lid, ti.ti_tid); thread_info = find_thread_pid (thread_ptid); /* In the case of a zombie thread, don't continue. We don't want to @@ -385,22 +384,14 @@ thread_from_lwp (ptid_t ptid) gdb_assert (thread_info && thread_info->private->ti_valid); - return BUILD_THREAD (thread_info->private->ti.ti_tid, GET_PID (ptid)); + return ptid_build (GET_PID (ptid), GET_LWP (ptid), + thread_info->private->ti.ti_tid); } static ptid_t lwp_from_thread (ptid_t ptid) { - struct thread_info *thread_info; - ptid_t thread_ptid; - - if (!is_thread (ptid)) - return ptid; - - thread_info = find_thread_pid (ptid); - thread_db_get_info (thread_info); - - return BUILD_LWP (thread_info->private->ti.ti_lid, GET_PID (ptid)); + return BUILD_LWP (GET_LWP (ptid), GET_PID (ptid)); } @@ -903,7 +894,7 @@ check_event (ptid_t ptid) if (err != TD_OK) error ("Cannot get thread info: %s", thread_db_err_str (err)); - ptid = BUILD_THREAD (ti.ti_tid, GET_PID (ptid)); + ptid = ptid_build (GET_PID (ptid), ti.ti_lid, ti.ti_tid); switch (msg.event) { @@ -1175,7 +1166,7 @@ find_new_threads_callback (const td_thrhandle_t *th_p, void *data) if (ti.ti_state == TD_THR_UNKNOWN || ti.ti_state == TD_THR_ZOMBIE) return 0; /* A zombie -- ignore. */ - ptid = BUILD_THREAD (ti.ti_tid, GET_PID (inferior_ptid)); + ptid = ptid_build (GET_PID (inferior_ptid), ti.ti_lid, ti.ti_tid); if (!in_thread_list (ptid)) attach_thread (ptid, th_p, &ti, 1); |