[PATCH 05/28] Don't write to inferior_ptid in inf-ptrace.c

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

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

* inf-ptrace.c (inf_ptrace_target::create_inferior): Switch to the
added thread.
(inf_ptrace_target::attach): Don't write to inferior_ptid. Switch
to the added thread.
(inf_ptrace_target::detach_success): Use switch_to_no_thread
instead of writing to inferior_ptid.
---
gdb/inf-ptrace.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index 1fa7aa3f73..8005187975 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -126,9 +126,6 @@ inf_ptrace_target::create_inferior (const char *exec_file,
const std::string &allargs,
char **env, int from_tty)
{
- pid_t pid;
- ptid_t ptid;
-
/* Do not change either targets above or the same target if already present.
The reason is the target stack is shared across multiple inferiors. */
int ops_already_pushed = target_is_pushed (this);
@@ -141,14 +138,15 @@ inf_ptrace_target::create_inferior (const char *exec_file,
unpusher.reset (this);
}

- pid = fork_inferior (exec_file, allargs, env, inf_ptrace_me, NULL,
- NULL, NULL, NULL);
+ pid_t pid = fork_inferior (exec_file, allargs, env, inf_ptrace_me, NULL,
+ NULL, NULL, NULL);

- ptid = ptid_t (pid);
+ ptid_t ptid (pid);
/* 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 (this, ptid);
+ thread_info *thr = add_thread_silent (this, ptid);
+ switch_to_thread (thr);

unpusher.release ();

@@ -243,11 +241,12 @@ inf_ptrace_target::attach (const char *args, int from_tty)
inf = current_inferior ();
inferior_appeared (inf, pid);
inf->attach_flag = 1;
- inferior_ptid = ptid_t (pid);

/* Always add a main thread. If some target extends the ptrace
target, it should decorate the ptid later with more info. */
- thread_info *thr = add_thread_silent (this, inferior_ptid);
+ thread_info *thr = add_thread_silent (this, ptid_t (pid));
+ switch_to_thread (thr);
+
/* Don't consider the thread stopped until we've processed its
initial SIGSTOP stop. */
set_executing (this, thr->ptid, true);
@@ -302,7 +301,7 @@ inf_ptrace_target::detach (inferior *inf, int from_tty)
void
inf_ptrace_target::detach_success (inferior *inf)
{
- inferior_ptid = null_ptid;
+ switch_to_no_thread ();
detach_inferior (inf);

maybe_unpush_target ();
--
2.14.5