[3/7] Adjust the bsd-uthread target

Pedro Alves
2008-08-08T01:36:00Z

[-- Attachment #1: Type: text/plain, Size: 405 bytes --]

This patch adjusts the bsd-uthread target to use thread_change_ptid,
and to never let the core see an event happen in a thread not in
the thread table.

Tested on i386-unknown-freebsd6.0 with a little hack in the
testsuite to link the gdb.thread tests against -lc_r instead
of -lpthread, and on i386-unknown-openbsd4.3, where no hack is
needed.

This patch depends on patch 1 and 2.

OK?

--
Pedro Alves

[-- Attachment #2: 003-bsd_uthreads.diff --]
[-- Type: text/x-diff, Size: 1719 bytes --]

2008-08-08 Pedro Alves <pedro@codesourcery.com>

* bsd-uthread.c (bsd_uthread_wait): Decorate the main thread with
thread_change_ptid. Check for exited threads.
(bsd_uthread_find_new_threads): Check for exited threads.

---
gdb/bsd-uthread.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)

Index: src/gdb/bsd-uthread.c
===================================================================
--- src.orig/gdb/bsd-uthread.c 2008-07-29 12:06:38.000000000 +0100
+++ src/gdb/bsd-uthread.c 2008-07-29 12:17:34.000000000 +0100
@@ -361,14 +361,16 @@ bsd_uthread_wait (ptid_t ptid, struct ta
}
}

- /* HACK: Twiddle INFERIOR_PTID such that the initial thread of a
- process isn't recognized as a new thread. */
- if (ptid_get_tid (ptid) != 0 && !in_thread_list (ptid)
- && ptid_get_tid (inferior_ptid) == 0)
- {
- add_thread_silent (ptid);
- inferior_ptid = ptid;
- }
+ /* If INFERIOR_PTID doesn't have a tid member yet, and we now have a
+ ptid with tid set, then ptid is still the initial thread of
+ the process. Notify GDB core about it. */
+ if (ptid_get_tid (inferior_ptid) == 0
+ && ptid_get_tid (ptid) != 0 && !in_thread_list (ptid))
+ thread_change_ptid (inferior_ptid, ptid);
+
+ /* Don't let the core see a ptid without a corresponding thread. */
+ if (!in_thread_list (ptid) || is_exited (ptid))
+ add_thread (ptid);

return ptid;
}
@@ -413,7 +415,7 @@ bsd_uthread_find_new_threads (void)
{
ptid_t ptid = ptid_build (pid, 0, addr);

- if (!in_thread_list (ptid))
+ if (!in_thread_list (ptid) || is_exited (ptid))
add_thread (ptid);

addr = read_memory_typed_address (addr + offset,