a25a5a45ef
By default, GDB removes all breakpoints from the target when the target stops and the prompt is given back to the user. This is useful in case GDB crashes while the user is interacting, as otherwise, there's a higher chance breakpoints would be left planted on the target. But, as long as any thread is running free, we need to make sure to keep breakpoints inserted, lest a thread misses a breakpoint. With that in mind, in preparation for non-stop mode, we added a "breakpoint always-inserted on" mode. This traded off the extra crash protection for never having threads miss breakpoints, and in addition is more efficient if there's a ton of breakpoints to remove/insert at each user command (e.g., at each "step"). When we added non-stop mode, and for a period, we required users to manually set "always-inserted on" when they enabled non-stop mode, as otherwise GDB removes all breakpoints from the target as soon as any thread stops, which means the other threads still running will miss breakpoints. The test added by this patch exercises this. That soon revealed a nuisance, and so later we added an extra "breakpoint always-inserted auto" mode, that made GDB behave like "always-inserted on" when non-stop was enabled, and "always-inserted off" when non-stop was disabled. "auto" was made the default at the same time. In hindsight, this "auto" setting was unnecessary, and not the ideal solution. Non-stop mode does depends on breakpoints always-inserted mode, but only as long as any thread is running. If no thread is running, no breakpoint can be missed. The same is true for all-stop too. E.g., if, in all-stop mode, and the user does: (gdb) c& (gdb) b foo That breakpoint at "foo" should be inserted immediately, but it currently isn't -- currently it'll end up inserted only if the target happens to trip on some event, and is re-resumed, e.g., an internal breakpoint triggers that doesn't cause a user-visible stop, and so we end up in keep_going calling insert_breakpoints. The test added by this patch also covers this. IOW, no matter whether in non-stop or all-stop, if the target fully stops, we can remove breakpoints. And no matter whether in all-stop or non-stop, if any thread is running in the target, then we need breakpoints to be immediately inserted. And then, if the target has global breakpoints, we need to keep breakpoints even when the target is stopped. So with that in mind, and aiming at reducing all-stop vs non-stop differences for all-stop-on-stop-of-non-stop, this patch fixes "breakpoint always-inserted off" to not remove breakpoints from the target until it fully stops, and then removes the "auto" setting as unnecessary. I propose removing it straight away rather than keeping it as an alias, unless someone complains they have scripts that need it and that can't adjust. Tested on x86_64 Fedora 20. gdb/ 2014-09-22 Pedro Alves <palves@redhat.com> * NEWS: Mention merge of "breakpoint always-inserted" modes "off" and "auto" merged. * breakpoint.c (enum ugll_insert_mode): New enum. (always_inserted_mode): Now a plain boolean. (show_always_inserted_mode): No longer handle AUTO_BOOLEAN_AUTO. (breakpoints_always_inserted_mode): Delete. (breakpoints_should_be_inserted_now): New function. (insert_breakpoints): Pass UGLL_INSERT to update_global_location_list instead of calling insert_breakpoint_locations manually. (create_solib_event_breakpoint_1): New, factored out from ... (create_solib_event_breakpoint): ... this. (create_and_insert_solib_event_breakpoint): Use create_solib_event_breakpoint_1 instead of calling insert_breakpoint_locations manually. (update_global_location_list): Change parameter type from boolean to enum ugll_insert_mode. All callers adjusted. Adjust to use breakpoints_should_be_inserted_now and handle UGLL_INSERT. (update_global_location_list_nothrow): Change parameter type from boolean to enum ugll_insert_mode. (_initialize_breakpoint): "breakpoint always-inserted" option is now a boolean command. Update help text. * breakpoint.h (breakpoints_always_inserted_mode): Delete declaration. (breakpoints_should_be_inserted_now): New declaration. * infrun.c (handle_inferior_event) <TARGET_WAITKIND_LOADED>: Remove breakpoints_always_inserted_mode check. (normal_stop): Adjust to use breakpoints_should_be_inserted_now. * remote.c (remote_start_remote): Likewise. gdb/doc/ 2014-09-22 Pedro Alves <palves@redhat.com> * gdb.texinfo (Set Breaks): Document that "set breakpoint always-inserted off" is the default mode now. Delete documentation of "set breakpoint always-inserted auto". gdb/testsuite/ 2014-09-22 Pedro Alves <palves@redhat.com> * gdb.threads/break-while-running.exp: New file. * gdb.threads/break-while-running.c: New file.
151 lines
4.7 KiB
Text
151 lines
4.7 KiB
Text
# Copyright (C) 2014 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/>.
|
|
|
|
# Test that:
|
|
#
|
|
# - setting a breakpoint while a thread is running results in the
|
|
# breakpoint being inserted immediately.
|
|
#
|
|
# - if breakpoint always-inserted mode is off, GDB doesn't remove
|
|
# breakpoints from the target when a thread stops, if there are
|
|
# still threads running.
|
|
|
|
standard_testfile
|
|
|
|
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
|
|
return -1
|
|
}
|
|
|
|
# The test proper. NON_STOP indicates whether we're testing in
|
|
# non-stop, or all-stop mode. ALWAYS_INSERTED indicates whether
|
|
# testing in "breakpoint always-inserted" mode.
|
|
|
|
proc test { always_inserted non_stop } {
|
|
global srcfile binfile
|
|
global gdb_prompt
|
|
global decimal
|
|
|
|
clean_restart $binfile
|
|
|
|
gdb_test_no_output "set non-stop $non_stop"
|
|
gdb_test_no_output "set breakpoint always-inserted $always_inserted"
|
|
|
|
if ![runto_main] {
|
|
return -1
|
|
}
|
|
|
|
# In all-stop, check whether we're testing with the remote or
|
|
# extended-remote targets. If so, skip the tests, as with the
|
|
# RSP, we can't issue commands until the target replies to vCont.
|
|
# Not an issue with the non-stop RSP variant, which has a
|
|
# non-blocking vCont.
|
|
if {$non_stop=="off" && [gdb_is_target_remote]} {
|
|
return -1
|
|
}
|
|
|
|
gdb_breakpoint [gdb_get_line_number "set wait-thread breakpoint here"]
|
|
gdb_continue_to_breakpoint "run to wait-thread breakpoint"
|
|
|
|
delete_breakpoints
|
|
|
|
# Leave the main thread stopped, so GDB can poke at memory freely.
|
|
if {$non_stop == "off"} {
|
|
gdb_test_no_output "set scheduler-locking on"
|
|
gdb_test "thread 2" "Switching to .*"
|
|
gdb_test "continue &" "Continuing\." "continuing thread 2"
|
|
gdb_test "thread 3" "Switching to .*"
|
|
gdb_test "continue &" "Continuing\." "continuing thread 3"
|
|
gdb_test "thread 1" "Switching to .*" "switch back to main thread"
|
|
}
|
|
|
|
gdb_test "info threads" \
|
|
"\\\(running\\\).*\\\(running\\\).* main .*" \
|
|
"only main stopped"
|
|
|
|
# Don't use gdb_test as it's racy in this case -- gdb_test matches
|
|
# the prompt with an end anchor. Sometimes expect will manage to
|
|
# read the breakpoint hit output while still processing this test,
|
|
# defeating the anchor.
|
|
set test "set breakpoint while a thread is running"
|
|
gdb_test_multiple "break breakpoint_function" $test {
|
|
-re "Breakpoint $decimal at .*: file .*$srcfile.*\r\n$gdb_prompt " {
|
|
pass $test
|
|
}
|
|
-re "$gdb_prompt " {
|
|
fail $test
|
|
}
|
|
}
|
|
|
|
# Check that the breakpoint is hit. Can't use gdb_test here, as
|
|
# no prompt is expected to come out.
|
|
set test "breakpoint is hit"
|
|
gdb_test_multiple "" $test {
|
|
-re "Breakpoint .*, breakpoint_function \[^\r\n\]+" {
|
|
pass $test
|
|
}
|
|
}
|
|
|
|
if {$non_stop == "on"} {
|
|
gdb_test "info threads" \
|
|
"\\\(running\\\).* breakpoint_function .* main .*" \
|
|
"one thread running"
|
|
|
|
# Unblock the other thread, which should then trip on the same
|
|
# breakpoint, unless GDB removed it by mistake. Can't use
|
|
# gdb_test here for the same reasons as above.
|
|
set test "unblock second thread"
|
|
gdb_test_multiple "print second_child = 1" $test {
|
|
-re " = 1\r\n$gdb_prompt " {
|
|
pass $test
|
|
}
|
|
-re "$gdb_prompt " {
|
|
fail $test
|
|
}
|
|
}
|
|
|
|
set test "breakpoint on second child is hit"
|
|
gdb_test_multiple "" $test {
|
|
-re "Breakpoint .*, breakpoint_function \[^\r\n\]+" {
|
|
pass $test
|
|
}
|
|
}
|
|
|
|
gdb_test "info threads" \
|
|
" breakpoint_function .* breakpoint_function .* main .*" \
|
|
"all threads stopped"
|
|
} else {
|
|
# This test is not merged with the non-stop one because in
|
|
# all-stop we don't know where the other thread stops (inside
|
|
# usleep, for example).
|
|
set test "all threads stopped"
|
|
gdb_test_multiple "info threads" "$test" {
|
|
-re "\\\(running\\\).*$gdb_prompt $" {
|
|
fail $test
|
|
}
|
|
-re "breakpoint_function .* main .*$gdb_prompt $" {
|
|
pass $test
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
foreach always_inserted { "off" "on" } {
|
|
foreach non_stop { "off" "on" } {
|
|
set stop_mode [expr ($non_stop=="off")?"all-stop":"non-stop"]
|
|
with_test_prefix "always-inserted $always_inserted: $stop_mode" {
|
|
test $always_inserted $non_stop
|
|
}
|
|
}
|
|
}
|