mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-04-24 14:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't write to inferior_ptid in gnu-nat.c

Browse Source 
Untested.

gdb/ChangeLog:
2020-06-18  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.
This commit is contained in:
Pedro Alves 2020-06-18 21:28:28 +01:00
parent 1a20473059
commit 975f8708de
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdb/ChangeLog
View File

@ -1,3 +1,13 @@
2020-06-18 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.
2020-06-18 Pedro Alves <palves@redhat.com>
* go32-nat.c (go32_nat_target::create_inferior): Don't write to

15
gdb/gnu-nat.c
View File

@ -2121,7 +2121,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 (this, ptid_t (pid));
thread_info *thr = add_thread_silent (this, 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);
@ -2196,7 +2197,9 @@ 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 (this, 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. */
@ -2225,8 +2228,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);
@ -2238,12 +2239,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 (this, pid));
switch_to_no_thread ();
detach_inferior (inf);
maybe_unpush_target ();
}