diff options
| author | Pedro Alves <palves@redhat.com> | 2008-09-08 21:25:05 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2008-09-08 21:25:05 +0000 |
| commit | af99052775b274a23fd8004bf816f9b299b96b23 (patch) | |
| tree | 1fd27a76f1c34e2449f016d8930af5e45ee9559b | |
| parent | 27c9d2043eb30017b949170a211fe73a61488492 (diff) | |
| download | gdb-af99052775b274a23fd8004bf816f9b299b96b23.zip gdb-af99052775b274a23fd8004bf816f9b299b96b23.tar.gz gdb-af99052775b274a23fd8004bf816f9b299b96b23.tar.bz2 | |
* inf-ptrace.c: Include "gdbthread.h".
(inf_ptrace_attach): Add the main thread here.
* linux-nat.c (linux_nat_attach): Don't add the main thread here.
Decorate the main thread id with the lwp id.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/inf-ptrace.c | 6 | ||||
| -rw-r--r-- | gdb/linux-nat.c | 13 |
3 files changed, 20 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3f73fe1..22bd2b2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2008-09-08 Pedro Alves <pedro@codesourcery.com> + * inf-ptrace.c: Include "gdbthread.h". + (inf_ptrace_attach): Add the main thread here. + * linux-nat.c (linux_nat_attach): Don't add the main thread here. + Decorate the main thread id with the lwp id. + +2008-09-08 Pedro Alves <pedro@codesourcery.com> + * linux-nat.c (linux_nat_wait): Update inferior_ptid's ptid with thread_change_ptid. Don't add or mark the main thread as running and executing here. diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c index ee2c8fa..6899be0 100644 --- a/gdb/inf-ptrace.c +++ b/gdb/inf-ptrace.c @@ -33,6 +33,7 @@ #include <signal.h> #include "inf-child.h" +#include "gdbthread.h" /* HACK: Save the ptrace ops returned by inf_ptrace_target. */ static struct target_ops *ptrace_ops_hack; @@ -218,6 +219,11 @@ inf_ptrace_attach (char *args, int from_tty) #endif inferior_ptid = pid_to_ptid (pid); + + /* Always add a main thread. If some target extends the ptrace + target, it should decorate the ptid later with more info. */ + add_thread_silent (inferior_ptid); + push_target (ptrace_ops_hack); } diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index fe78c25..8ba6ea9 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -1345,6 +1345,7 @@ linux_nat_attach (char *args, int from_tty) { struct lwp_info *lp; int status; + ptid_t ptid; /* FIXME: We should probably accept a list of process id's, and attach all of them. */ @@ -1359,18 +1360,18 @@ linux_nat_attach (char *args, int from_tty) sigdelset (&suspend_mask, SIGCHLD); } + /* The ptrace base target adds the main thread with (pid,0,0) + format. Decorate it with lwp info. */ + ptid = BUILD_LWP (GET_PID (inferior_ptid), GET_PID (inferior_ptid)); + thread_change_ptid (inferior_ptid, ptid); + /* Add the initial process as the first LWP to the list. */ - inferior_ptid = BUILD_LWP (GET_PID (inferior_ptid), GET_PID (inferior_ptid)); - lp = add_lwp (inferior_ptid); + lp = add_lwp (ptid); status = linux_nat_post_attach_wait (lp->ptid, 1, &lp->cloned, &lp->signalled); lp->stopped = 1; - /* If this process is not using thread_db, then we still don't - detect any other threads, but add at least this one. */ - add_thread_silent (lp->ptid); - /* Save the wait status to report later. */ lp->resumed = 1; if (debug_linux_nat) |