diff options
| author | Pedro Alves <palves@redhat.com> | 2015-03-04 15:03:33 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-03-04 15:03:33 +0000 |
| commit | 79639e11323e209d3dfd1355abac3b83a87c6878 (patch) | |
| tree | aab8e314b04d85bd611ff3118667581bd7ecae8c /gdb/linux-nat.c | |
| parent | d57be0f4420d42c62bb702f69c6d2a0dd5adef6a (diff) | |
| download | gdb-79639e11323e209d3dfd1355abac3b83a87c6878.zip gdb-79639e11323e209d3dfd1355abac3b83a87c6878.tar.gz gdb-79639e11323e209d3dfd1355abac3b83a87c6878.tar.bz2 | |
follow-fork: don't lose the ptids as set by the target
This Linuxism has made its way into infrun.c, in the follow-fork code:
inferior_ptid = ptid_build (child_pid, child_pid, 0);
The OS-specific code should fill in the LWPID, TID parts with the
appropriate values, if any, and the core code should not be peeking at
the components of the ptids.
gdb/
2015-03-04 Pedro Alves <palves@redhat.com>
* infrun.c (follow_fork_inferior): Use the whole of the
inferior_ptid and pending_follow.related_pid ptids instead of
building ptids from the process components. Adjust verbose output
to use target_pid_to_str.
* linux-nat.c (linux_child_follow_fork): Use the whole of the
inferior_ptid and pending_follow.related_pid ptids instead of
building ptids from the process components.
Diffstat (limited to 'gdb/linux-nat.c')
| -rw-r--r-- | gdb/linux-nat.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index cb10e2c..57bd1e7 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -387,20 +387,19 @@ linux_child_follow_fork (struct target_ops *ops, int follow_child, int status = W_STOPCODE (0); struct cleanup *old_chain; int has_vforked; + ptid_t parent_ptid, child_ptid; int parent_pid, child_pid; has_vforked = (inferior_thread ()->pending_follow.kind == TARGET_WAITKIND_VFORKED); - parent_pid = ptid_get_lwp (inferior_ptid); - if (parent_pid == 0) - parent_pid = ptid_get_pid (inferior_ptid); - child_pid - = ptid_get_pid (inferior_thread ()->pending_follow.value.related_pid); - + parent_ptid = inferior_ptid; + child_ptid = inferior_thread ()->pending_follow.value.related_pid; + parent_pid = ptid_get_lwp (parent_ptid); + child_pid = ptid_get_lwp (child_ptid); /* We're already attached to the parent, by default. */ old_chain = save_inferior_ptid (); - inferior_ptid = ptid_build (child_pid, child_pid, 0); + inferior_ptid = child_ptid; child_lp = add_lwp (inferior_ptid); child_lp->stopped = 1; child_lp->last_resume_kind = resume_stop; @@ -457,7 +456,7 @@ linux_child_follow_fork (struct target_ops *ops, int follow_child, { struct lwp_info *parent_lp; - parent_lp = find_lwp_pid (pid_to_ptid (parent_pid)); + parent_lp = find_lwp_pid (parent_ptid); gdb_assert (linux_supports_tracefork () >= 0); if (linux_supports_tracevforkdone ()) |