mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
873657b9e8
In non-stop mode, if you resume the program in the background (with
"continue&", for example), then gdb makes sure to not switch the
current thread behind your back. That means that you can be sure that
the commands you type apply to the thread you selected, even if some
other thread that was running in the background hits some event just
while you're typing.
In all-stop mode, however, if you resume the program in the
background, gdb let's the current thread switch behind your back.
This is bogus, of course. All-stop and non-stop background
resumptions should behave the same.
This patch fixes that, and adds a testcase that exposes the bad
behavior in current master.
The fork-running-state.exp changes are necessary because that
preexisting testcase was expecting the old behavior:
Before:
continue &
Continuing.
(gdb)
[Attaching after process 8199 fork to child process 8203]
[New inferior 2 (process 8203)]
info threads
Id Target Id Frame
1.1 process 8199 "fork-running-st" (running)
* 2.1 process 8203 "fork-running-st" (running)
(gdb)
After:
continue &
Continuing.
(gdb)
[Attaching after process 24660 fork to child process 24664]
[New inferior 2 (process 24664)]
info threads
Id Target Id Frame
* 1.1 process 24660 "fork-running-st" (running)
2.1 process 24664 "fork-running-st" (running)
(gdb)
Here we see that before this patch GDB switches current inferior to
the new inferior behind the user's back, as a side effect of handling
the fork.
The delete_exited_threads call in inferior_appeared is there to fix an
issue that Baris found in a previous version of this patch. The
fetch_inferior_event change increases the refcount of the current
thread, and in case the fetched inferior event denotes a thread exit,
the thread will not be deleted right away. A non-deleted but exited
thread stays in the inferior's thread list. This, in turn, causes the
"init_thread_list" call in inferior.c to be skipped. A consequence is
that the global thread ID counter is not restarted if the current
thread exits, and then the inferior is restarted:
(gdb) start
Temporary breakpoint 1 at 0x4004d6: file main.c, line 21.
Starting program: /tmp/main
Temporary breakpoint 1, main () at main.c:21
21 foo ();
(gdb) info threads -gid
Id GId Target Id Frame
* 1 1 process 16106 "main" main () at main.c:21
(gdb) c
Continuing.
[Inferior 1 (process 16106) exited normally]
(gdb) start
Temporary breakpoint 2 at 0x4004d6: file main.c, line 21.
Starting program: /tmp/main
Temporary breakpoint 2, main () at main.c:21
21 foo ();
(gdb) info threads -gid
Id GId Target Id Frame
* 1 2 process 16138 "main" main () at main.c:21
^^^
Notice that GId == 2 above. It should have been "1" instead.
The new tids-git-reset.exp testcase exercises the problem above.
gdb/ChangeLog:
2020-01-10 Pedro Alves <palves@redhat.com>
* gdbthread.h (scoped_restore_current_thread)
<dont_restore, restore, m_dont_restore>: Declare.
* thread.c (thread_alive): Add assertion. Return bool.
(switch_to_thread_if_alive): New.
(prune_threads): Switch inferior/thread.
(print_thread_info_1): Switch thread before calling target methods.
(scoped_restore_current_thread::restore): New, factored out from
...
(scoped_restore_current_thread::~scoped_restore_current_thread):
... this.
(scoped_restore_current_thread::scoped_restore_current_thread):
Add assertion.
(thread_apply_all_command, thread_select): Use
switch_to_thread_if_alive.
gdb/testsuite/ChangeLog:
2020-01-10 Pedro Alves <palves@redhat.com>
* gdb.base/fork-running-state.exp (do_test): Adjust expected
output.
* gdb.threads/async.c: New.
* gdb.threads/async.exp: New.
* gdb.multi/tids-gid-reset.c: New.
* gdb.multi/tids-gid-reset.exp: New.
99 lines
2.8 KiB
Plaintext
99 lines
2.8 KiB
Plaintext
# Copyright (C) 2019-2020 Free Software Foundation, Inc.
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
standard_testfile
|
|
|
|
if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
|
|
return -1
|
|
}
|
|
|
|
# At this point GDB will be busy handling the breakpoint hits and
|
|
# re-resuming the program. Even if GDB internally switches thread
|
|
# context, the user should not notice it. The following part of the
|
|
# testcase ensures that.
|
|
|
|
# Switch to thread EXPECTED_THR, and then confirm that the thread
|
|
# stays selected.
|
|
|
|
proc test_current_thread {expected_thr} {
|
|
global decimal
|
|
global gdb_prompt
|
|
global binfile
|
|
|
|
clean_restart $binfile
|
|
|
|
if {![runto "all_started"]} {
|
|
fail "could not run to all_started"
|
|
return
|
|
}
|
|
|
|
# Set a breakpoint that continuously fires but doeesn't cause a stop.
|
|
gdb_breakpoint [concat [gdb_get_line_number "set breakpoint here"] " if 0"]
|
|
|
|
gdb_test "thread $expected_thr" "Switching to thread $expected_thr .*" \
|
|
"switch to thread $expected_thr"
|
|
|
|
# Continue the program in the background.
|
|
set test "continue&"
|
|
gdb_test_multiple "continue&" $test {
|
|
-re "Continuing\\.\r\n$gdb_prompt " {
|
|
pass $test
|
|
}
|
|
}
|
|
|
|
set test "current thread is $expected_thr"
|
|
set fails 0
|
|
for {set i 0} {$i < 10} {incr i} {
|
|
after 200
|
|
|
|
set cur_thread 0
|
|
gdb_test_multiple "thread" $test {
|
|
-re "Current thread is ($decimal) .*$gdb_prompt " {
|
|
set cur_thread $expect_out(1,string)
|
|
}
|
|
}
|
|
|
|
if {$cur_thread != $expected_thr} {
|
|
incr fails
|
|
}
|
|
}
|
|
|
|
gdb_assert {$fails == 0} $test
|
|
|
|
# Explicitly interrupt the target, because in all-stop/remote,
|
|
# that's all we can do when the target is running. If we don't do
|
|
# this, we'd time out trying to kill the target, while bringing
|
|
# down gdb & gdbserver.
|
|
set test "interrupt"
|
|
gdb_test_multiple $test $test {
|
|
-re "^interrupt\r\n$gdb_prompt " {
|
|
gdb_test_multiple "" $test {
|
|
-re "Thread .* received signal SIGINT, Interrupt\\." {
|
|
pass $test
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
# Try once with each thread as current, to avoid missing a bug just
|
|
# because some part of GDB manages to switch to the right thread by
|
|
# chance.
|
|
for {set thr 1} {$thr <= 3} {incr thr} {
|
|
with_test_prefix "thread $thr" {
|
|
test_current_thread $thr
|
|
}
|
|
}
|