[PATCH 15/28] Don't write to inferior_ptid in gnu-nat.c

Pedro Alves
2020-04-14T17:54:49Z

Untested.

gdb/ChangeLog:
yyyy-mm-dd Pedro Alves <palves@redhat.com>

* gnu-nat.c (gnu_nat_target::create_inferior): Switch to the added
thread.
(gnu_nat_target::attach): Don't write to inferior_ptid directly.
Instead use switch_to_thread.
(gnu_nat_target::detach): Use switch_to_no_thread
instead of writing to inferior_ptid directly. Used passed-in
inferior instead of looking up the inferior by pid.
---
gdb/gnu-nat.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 3b438a9a43..d4ecf50014 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -2149,7 +2149,8 @@ gnu_nat_target::create_inferior (const char *exec_file,
/* We have something that executes now. We'll be running through
the shell at this point (if startup-with-shell is true), but the
pid shouldn't change. */
- add_thread_silent (ptid_t (pid));
+ thread_info *thr = add_thread_silent (ptid_t (pid));
+ switch_to_thread (thr);

/* Attach to the now stopped child, which is actually a shell... */
inf_debug (inf, "attaching to child: %d", pid);
@@ -2226,7 +2227,8 @@ gnu_nat_target::attach (const char *args, int from_tty)

inf_update_procs (inf);

- inferior_ptid = ptid_t (pid, inf_pick_first_thread (), 0);
+ thread_info *thr = find_thread_ptid (ptid_t (pid, inf_pick_first_thread ()));
+ switch_to_thread (thr);

/* We have to initialize the terminal settings now, since the code
below might try to restore them. */
@@ -2255,8 +2257,6 @@ gnu_nat_target::attach (const char *args, int from_tty)
void
gnu_nat_target::detach (inferior *inf, int from_tty)
{
- int pid;
-
if (from_tty)
{
const char *exec_file = get_exec_file (0);
@@ -2268,12 +2268,10 @@ gnu_nat_target::detach (inferior *inf, int from_tty)
printf_unfiltered ("Detaching from pid %d\n", gnu_current_inf->pid);
}

- pid = gnu_current_inf->pid;
-
inf_detach (gnu_current_inf);

- inferior_ptid = null_ptid;
- detach_inferior (find_inferior_pid (pid));
+ switch_to_no_thread ();
+ detach_inferior (inf);

maybe_unpush_target ();
}
--
2.14.5