diff options
author | Simon Marchi <simon.marchi@ericsson.com> | 2018-01-19 11:48:11 -0500 |
---|---|---|
committer | Simon Marchi <simon.marchi@ericsson.com> | 2018-01-19 11:48:11 -0500 |
commit | bc09b0c14fb713a9aec25e09b78499f3bc2441b5 (patch) | |
tree | 1be85b1497ab8383a20262964e0c9610988c42b5 /gdb/linux-nat.c | |
parent | 6e1e1966bac965c5a26b5e5cae69cb0ed21be4cc (diff) | |
download | gdb-bc09b0c14fb713a9aec25e09b78499f3bc2441b5.zip gdb-bc09b0c14fb713a9aec25e09b78499f3bc2441b5.tar.gz gdb-bc09b0c14fb713a9aec25e09b78499f3bc2441b5.tar.bz2 |
Make linux_nat_detach/thread_db_detach use the inferior parameter
This patch makes these two functions actually use the inferior parameter
added by the previous patch, instead of reading inferior_ptid. I chose
these two, because they are the one actually used when I detach on my
GNU/Linux system, so they were easy to test.
I took the opportunity to pass the inferior being detached to
inf_ptrace_detach_success, so it could use it too. From there, it made
sense to add an overload of detach_inferior that takes the inferior
directly rather than the pid, to avoid having to pass inf->pid only for
the callee to look up the inferior structure by pid.
gdb/ChangeLog:
* inf-ptrace.c (inf_ptrace_detach): Adjust call to
inf_ptrace_detach_success.
(inf_ptrace_detach_success): Add inferior parameter, use it
instead of inferior_ptid, pass it to detach_inferior.
* inf-ptrace.h (inf_ptrace_detach_success): Add inferior
parameter.
* inferior.c (detach_inferior): Add overload that takes an
inferior object.
* inferior.h (detach_inferior): Likewise.
* linux-nat.c (linux_nat_detach): Use the inf parameter, don't
use inferior_ptid, adjust call to inf_ptrace_detach_success.
* linux-thread-db.c (thread_db_detach): Use inf parameter.
Diffstat (limited to 'gdb/linux-nat.c')
-rw-r--r-- | gdb/linux-nat.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index 70f4c08..b83066c 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -1499,10 +1499,8 @@ detach_callback (struct lwp_info *lp, void *data) static void linux_nat_detach (struct target_ops *ops, inferior *inf, int from_tty) { - int pid; struct lwp_info *main_lwp; - - pid = ptid_get_pid (inferior_ptid); + int pid = inf->pid; /* Don't unregister from the event loop, as there may be other inferiors running. */ @@ -1517,7 +1515,7 @@ linux_nat_detach (struct target_ops *ops, inferior *inf, int from_tty) iterate_over_lwps (pid_to_ptid (pid), detach_callback, NULL); /* Only the initial process should be left right now. */ - gdb_assert (num_lwps (ptid_get_pid (inferior_ptid)) == 1); + gdb_assert (num_lwps (pid) == 1); main_lwp = find_lwp_pid (pid_to_ptid (pid)); @@ -1538,7 +1536,7 @@ linux_nat_detach (struct target_ops *ops, inferior *inf, int from_tty) detach_one_lwp (main_lwp, &signo); - inf_ptrace_detach_success (ops); + inf_ptrace_detach_success (ops, inf); } } |