forked from Imagelibrary/binutils-gdb
6cce025114
This commit updates GDB so that thread or inferior specific breakpoints are only inserted into the program space in which the specific thread or inferior is running. In terms of implementation, getting this basically working is easy enough, now that a breakpoint's thread or inferior field is setup prior to GDB looking for locations, we can easily use this information to find a suitable program_space and pass this to as a filter when creating the sals. Or we could if breakpoint_ops::create_sals_from_location_spec allowed us to pass in a filter program_space. So, this commit extends breakpoint_ops::create_sals_from_location_spec to take a program_space argument, and uses this to filter the set of returned sals. This accounts for about half the change in this patch. The second set of changes starts from breakpoint_set_thread and breakpoint_set_inferior, this is called when the thread or inferior for a breakpoint changes, e.g. from the Python API. Previously this call would never result in the locations of a breakpoint changing, after all, locations were inserted in every program space, and we just use the thread or inferior variable to decide when we should stop. Now though, changing a breakpoint's thread or inferior can mean we need to figure out a new set of breakpoint locations. To support this I've added a new breakpoint_re_set_one function, which is like breakpoint_re_set, but takes a single breakpoint, and just updates the locations for that one breakpoint. We only need to call this function if the program_space in which a breakpoint's thread (or inferior) is running actually changes. If the program_space does change then we call the new breakpoint_re_set_one function passing in the program_space which should be used to filter the new locations (or nullptr to indicate we should set locations in all program spaces). This filter program_space needs to propagate down to all the re_set methods, this accounts for the remaining half of the changes in this patch. There were a couple of existing tests that created thread or inferior specific breakpoints and then checked the 'info breakpoints' output, these needed updating. These were: gdb.mi/user-selected-context-sync.exp gdb.multi/bp-thread-specific.exp gdb.multi/multi-target-continue.exp gdb.multi/multi-target-ping-pong-next.exp gdb.multi/tids.exp gdb.mi/new-ui-bp-deleted.exp gdb.multi/inferior-specific-bp.exp gdb.multi/pending-bp-del-inferior.exp I've also added some additional tests to: gdb.multi/pending-bp.exp I've updated the documentation and added a NEWS entry. Reviewed-By: Eli Zaretskii <eliz@gnu.org>
105 lines
3.3 KiB
Plaintext
105 lines
3.3 KiB
Plaintext
# Copyright 2023-2024 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/>.
|
|
|
|
# Check that GDB uses the correct thread-id when describing multiple
|
|
# thread specific breakpoints at the same location.
|
|
#
|
|
# Also check that the correct thread-ids are used in the saved
|
|
# breakpoints file.
|
|
|
|
# The plain remote target can't do multiple inferiors.
|
|
require !use_gdb_stub
|
|
|
|
standard_testfile
|
|
|
|
if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
|
|
return -1
|
|
}
|
|
|
|
if {![runto_main]} {
|
|
return -1
|
|
}
|
|
|
|
gdb_test "add-inferior -exec ${binfile}" "Added inferior 2.*" "add inferior 2"
|
|
gdb_test "inferior 2"
|
|
|
|
if {![runto_main]} {
|
|
return -1
|
|
}
|
|
|
|
gdb_test "info threads" \
|
|
[multi_line \
|
|
" Id\\s+Target Id\\s+Frame\\s*" \
|
|
" 1\\.1\\s+\[^\r\n\]+" \
|
|
"\\* 2\\.1\\s+\[^\r\n\]+"] \
|
|
"check we have the expected threads"
|
|
|
|
# Set the first breakpoint. Currently this is going to insert at two
|
|
# locations ('foo' in both inferiors) even though only one of those
|
|
# locations will ever trigger ('foo' in inferior 2).
|
|
gdb_test "break foo thread 2.1" \
|
|
"Breakpoint $decimal at $hex: file \[^\r\n\]+$srcfile, line $decimal\\."
|
|
|
|
set bpnum [get_integer_valueof "\$bpnum" "INVALID"]
|
|
|
|
# Now set another breakpoint that will be at the same location as the
|
|
# earlier breakpoint. Check that the thread-id used when describing
|
|
# the earlier breakpoints is correct.
|
|
gdb_test "break foo thread 1.1" \
|
|
"Breakpoint $decimal at $hex: file \[^\r\n\]+$srcfile, line $decimal\\."
|
|
|
|
# Save the breakpoints into a file.
|
|
if {[is_remote host]} {
|
|
set bps bps
|
|
} else {
|
|
set bps [standard_output_file bps]
|
|
}
|
|
|
|
remote_file host delete "$bps"
|
|
gdb_test "save breakpoints $bps" "" "save breakpoint to bps"
|
|
|
|
if {[is_remote host]} {
|
|
set bps [remote_upload host bps [standard_output_file bps]]
|
|
}
|
|
|
|
# Now dig through the saved breakpoints file and check that the
|
|
# thread-ids were written out correctly. First open the saved
|
|
# breakpoints and read them into a list.
|
|
set fh [open $bps]
|
|
set lines [split [read $fh] "\n"]
|
|
close $fh
|
|
|
|
# Except the list created from the saved breakpoints file will have a
|
|
# blank line entry at the end, so remove it now.
|
|
gdb_assert {[string equal [lindex $lines end] ""]} \
|
|
"check last item was an empty line"
|
|
set lines [lrange $lines 0 end-1]
|
|
|
|
# These are the lines we expect in the saved breakpoints file, in the
|
|
# order that we expect them. These are strings, not regexps.
|
|
set expected_results \
|
|
[list \
|
|
"break -qualified main" \
|
|
"break foo thread 2.1" \
|
|
"break foo thread 1.1"]
|
|
|
|
# Now check that the files contents (in LINES) matches the
|
|
# EXPECTED_RESULTS.
|
|
gdb_assert {[llength $lines] == [llength $expected_results]} \
|
|
"correct number of lines in saved breakpoints file"
|
|
foreach a $lines b $expected_results {
|
|
gdb_assert {[string equal $a $b]} "line '$b'"
|
|
}
|