5ce0145de7
Like when stepping, the current stack frame location is expected to be printed as result of tfind command, if that results in moving to a different function. In tfind_1 we see: if (from_tty && (has_stack_frames () || traceframe_number >= 0)) { enum print_what print_what; /* NOTE: in imitation of the step command, try to determine whether we have made a transition from one function to another. If so, we'll print the "stack frame" (ie. the new function and it's arguments) -- otherwise we'll just show the new source line. */ if (frame_id_eq (old_frame_id, get_frame_id (get_current_frame ()))) print_what = SRC_LINE; else print_what = SRC_AND_LOC; print_stack_frame (get_selected_frame (NULL), 1, print_what, 1); do_displays (); } However, when we haven't collected any registers in the tracepoint (collect $regs), that doesn't actually work: (gdb) tstart (gdb) info tracepoints Num Type Disp Enb Address What 1 tracepoint keep y 0x080483b7 in func0 at ../.././../git/gdb/testsuite/gdb.trace/circ.c:28 collect testload installed on target 2 tracepoint keep y 0x080483bc in func1 at ../.././../git/gdb/testsuite/gdb.trace/circ.c:32 collect testload installed on target (gdb) c Continuing. Breakpoint 3, end () at ../.././../git/gdb/testsuite/gdb.trace/circ.c:72 72 } (gdb) tstop (gdb) tfind start Found trace frame 0, tracepoint 1 #0 func0 () at ../.././../git/gdb/testsuite/gdb.trace/circ.c:28 28 } (gdb) tfind Found trace frame 1, tracepoint 2 32 } (gdb) When we don't have info about the stack available (UNWIND_UNAVAILABLE), frames end up with outer_frame_id as frame ID. And in the scenario above, the issue is that both frames before and after the second tfind (the frames for func0 an func1) have the same id (outer_frame_id), so the frame_id_eq check returns false, even though the frames were of different functions. GDB knows that, because the PC is inferred from the tracepoint's address, even if no registers were collected. To fix this, this patch adds support for frame ids with a valid code address, but <unavailable> stack address, and then makes the unwinders use that instead of the catch-all outer_frame_id for such frames. The frame_id_eq check in tfind_1 then automatically does the right thing as expected. I tested with --directory=gdb.trace/ , before/after the patch, and compared the resulting gdb.logs, then adjusted the tests to expect the extra output that came out. Turns out that was only circ.exp, the original test that actually brought this issue to light. Tested on x86_64 Fedora 17, native and gdbserver. gdb/ 2013-12-17 Pedro Alves <palves@redhat.com> * frame.h (enum frame_id_stack_status): New enum. (struct frame_id) <stack_addr>: Adjust comment. <stack_addr_p>: Delete field, replaced with ... <stack_status>: ... this new field. (frame_id_build_unavailable_stack): Declare. * frame.c (frame_addr_hash, fprint_field, outer_frame_id) (frame_id_build_special): Adjust. (frame_id_build_unavailable_stack): New function. (frame_id_build, frame_id_build_wild): Adjust. (frame_id_p, frame_id_eq, frame_id_inner): Adjust to take into account frames with unavailable stack. * amd64-tdep.c (amd64_frame_this_id) (amd64_sigtramp_frame_this_id, amd64_epilogue_frame_this_id): Use frame_id_build_unavailable_stack. * dwarf2-frame.c (dwarf2_frame_this_id): Likewise. * i386-tdep.c (i386_frame_this_id, i386_epilogue_frame_this_id) (i386_sigtramp_frame_this_id): Likewise. gdb/testsuite/ 2013-12-17 Pedro Alves <palves@redhat.com> * gdb.trace/circ.exp: Expect frame info to be printed when switching between frames with unavailable stack, but different functions.
287 lines
8.4 KiB
Text
287 lines
8.4 KiB
Text
# Copyright 1998-2013 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/>.
|
|
|
|
load_lib "trace-support.exp"
|
|
|
|
standard_testfile
|
|
|
|
if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} {
|
|
return -1
|
|
}
|
|
|
|
# Tests:
|
|
# 1) Calculate the size taken by one trace frame.
|
|
# 2) Set up a trace experiment that will collect approximately 10 frames,
|
|
# requiring more than 512 but less than 1024 bytes of cache buffer.
|
|
# (most targets should have at least 1024 bytes of cache buffer!)
|
|
# Run and confirm that it collects all 10 frames.
|
|
# 3) Artificially limit the trace buffer to 4x + a bytes. Here x is the size
|
|
# of single trace frame and a is a small constant. Rerun the
|
|
# experiment. Confirm that the frame for the first tracepoint is collected,
|
|
# but frames for the last several tracepoints are not.
|
|
# 4) Set trace buffer to circular mode, with the buffer size as in
|
|
# step 3 above. Rerun the experiment. Confirm that the frame for the last
|
|
# tracepoint is collected but not for the first one.
|
|
#
|
|
|
|
# Set a tracepoint on given func. The tracepoint is set at entry
|
|
# address and not 'after prologue' address because we use
|
|
# 'tfind pc func' to find the corresponding trace frame afterwards,
|
|
# and that looks for entry address.
|
|
proc set_a_tracepoint { func } {
|
|
gdb_test "trace \*$func" "Tracepoint \[0-9\]+ at .*" \
|
|
"set tracepoint at $func"
|
|
gdb_trace_setactions "set actions for $func" "" "collect testload" "^$"
|
|
}
|
|
|
|
# Sets the tracepoints from func0 to func9 using set_a_tracepoint.
|
|
proc setup_tracepoints { } {
|
|
gdb_delete_tracepoints
|
|
set_a_tracepoint func0
|
|
set_a_tracepoint func1
|
|
set_a_tracepoint func2
|
|
set_a_tracepoint func3
|
|
set_a_tracepoint func4
|
|
set_a_tracepoint func5
|
|
set_a_tracepoint func6
|
|
set_a_tracepoint func7
|
|
set_a_tracepoint func8
|
|
set_a_tracepoint func9
|
|
}
|
|
|
|
# Start the trace, run to end and then stop the trace.
|
|
proc run_trace_experiment { } {
|
|
global decimal
|
|
|
|
setup_tracepoints
|
|
gdb_test "break end" "Breakpoint $decimal.*" "breakpoint at end"
|
|
gdb_test "tstart" "\[\r\n\]*" "start trace experiment"
|
|
gdb_test "continue" "Continuing.*Breakpoint \[0-9\]+, end.*" \
|
|
"run to end"
|
|
gdb_test "tstop" "\[\r\n\]*" "stop trace experiment"
|
|
}
|
|
|
|
if { ![runto_main] } {
|
|
fail "can't run to main to check for trace support"
|
|
return -1
|
|
}
|
|
|
|
if { ![gdb_target_supports_trace] } {
|
|
unsupported "target does not support trace"
|
|
return 1
|
|
}
|
|
|
|
set test "set circular-trace-buffer on"
|
|
gdb_test_multiple "set circular-trace-buffer on" $test {
|
|
-re ".*Target does not support this command.*$gdb_prompt $" {
|
|
unsupported "target does not support circular trace buffer"
|
|
return 1
|
|
}
|
|
-re "$gdb_prompt $" {
|
|
pass $test
|
|
}
|
|
}
|
|
|
|
set circular_supported -1
|
|
set test "check whether circular buffer is supported"
|
|
|
|
gdb_test_multiple "tstatus" $test {
|
|
-re ".*Trace buffer is circular.*$gdb_prompt $" {
|
|
set circular_supported 1
|
|
pass $test
|
|
}
|
|
-re "$gdb_prompt $" {
|
|
pass $test
|
|
}
|
|
}
|
|
|
|
if { $circular_supported < 0 } {
|
|
unsupported "target does not support circular trace buffer"
|
|
return 1
|
|
}
|
|
|
|
gdb_test "show circular-trace-buffer" \
|
|
"Target's use of circular trace buffer is on." \
|
|
"show circular-trace-buffer (on)"
|
|
|
|
# Check if changing the trace buffer size is supported. This step is
|
|
# repeated twice. This helps in case the trace buffer size is 100.
|
|
set test_size 100
|
|
set test "change buffer size to $test_size"
|
|
gdb_test_multiple "set trace-buffer-size $test_size" $test {
|
|
-re ".*Target does not support this command.*$gdb_prompt $" {
|
|
unsupported "target does not support changing trace buffer size"
|
|
return 1
|
|
}
|
|
-re "$gdb_prompt $" {
|
|
pass $test
|
|
}
|
|
}
|
|
|
|
set test "check whether setting trace buffer size is supported"
|
|
gdb_test_multiple "tstatus" $test {
|
|
-re ".*Trace buffer has ($decimal) bytes of ($decimal) bytes free.*$gdb_prompt $" {
|
|
set total_size $expect_out(2,string)
|
|
if { $test_size != $total_size } {
|
|
unsupported "target does not support changing trace buffer size"
|
|
return 1
|
|
}
|
|
pass $test
|
|
}
|
|
}
|
|
|
|
set test_size 400
|
|
gdb_test_no_output "set trace-buffer-size $test_size" \
|
|
"change buffer size to $test_size"
|
|
|
|
gdb_test_multiple "tstatus" $test {
|
|
-re ".*Trace buffer has ($decimal) bytes of ($decimal) bytes free.*$gdb_prompt $" {
|
|
set total_size $expect_out(2,string)
|
|
if { $test_size != $total_size } {
|
|
unsupported "target does not support changing trace buffer size"
|
|
return 1
|
|
}
|
|
pass $test
|
|
}
|
|
}
|
|
|
|
gdb_test_no_output "set circular-trace-buffer off" \
|
|
"set circular-trace-buffer off"
|
|
|
|
gdb_test "show circular-trace-buffer" \
|
|
"Target's use of circular trace buffer is off." \
|
|
"show circular-trace-buffer (off)"
|
|
|
|
set total_size -1
|
|
set free_size -1
|
|
set frame_size -1
|
|
|
|
# Determine the size used by a single frame. Set a single tracepoint,
|
|
# run and then check the total and free size using the tstatus command.
|
|
# Then subtracting free from total gives us the size of a frame.
|
|
with_test_prefix "frame size" {
|
|
set_a_tracepoint func0
|
|
|
|
gdb_test "break end" "Breakpoint $decimal.*" "breakpoint at end"
|
|
|
|
gdb_test "tstart" "\[\r\n\]*" "start trace"
|
|
|
|
gdb_test "continue" "Continuing.*Breakpoint \[0-9\]+, end.*" \
|
|
"run to end"
|
|
|
|
gdb_test "tstop" "\[\r\n\]*" "stop trace"
|
|
|
|
set test "get buffer size"
|
|
|
|
gdb_test_multiple "tstatus" $test {
|
|
-re ".*Trace buffer has ($decimal) bytes of ($decimal) bytes free.*$gdb_prompt $" {
|
|
set free_size $expect_out(1,string)
|
|
set total_size $expect_out(2,string)
|
|
pass $test
|
|
}
|
|
}
|
|
|
|
# Check that we get the total_size and free_size.
|
|
if { $total_size < 0 } {
|
|
return 1
|
|
}
|
|
|
|
if { $free_size < 0 } {
|
|
return 1
|
|
}
|
|
}
|
|
|
|
# Calculate the size of a single frame.
|
|
set frame_size "($total_size - $free_size)"
|
|
|
|
with_test_prefix "normal buffer" {
|
|
clean_restart $testfile
|
|
|
|
if { ![runto_main] } {
|
|
fail "can't run to main"
|
|
return 1
|
|
}
|
|
|
|
run_trace_experiment
|
|
|
|
# Check that the first frame is actually at func0.
|
|
gdb_test "tfind start" ".*#0 func0 .*" \
|
|
"first frame is at func0"
|
|
|
|
gdb_test "tfind pc func9" \
|
|
".*Found trace frame $decimal, tracepoint $decimal\r\n#0 func9 .*" \
|
|
"find frame for func9"
|
|
}
|
|
|
|
# Shrink the trace buffer so that it will not hold
|
|
# all ten trace frames. Verify that the frame for func0 is still
|
|
# collected, but the frame for func9 is not.
|
|
|
|
set buffer_size "((4 * $frame_size) + 10)"
|
|
with_test_prefix "small buffer" {
|
|
clean_restart $testfile
|
|
|
|
if { ![runto_main] } {
|
|
fail "can't run to main"
|
|
return 1
|
|
}
|
|
|
|
gdb_test_no_output "set trace-buffer-size $buffer_size" \
|
|
"shrink the target trace buffer"
|
|
|
|
run_trace_experiment
|
|
|
|
gdb_test "tfind start" ".*#0 func0 .*" \
|
|
"first frame is at func0"
|
|
|
|
gdb_test "tfind pc func9" ".* failed to find .*" \
|
|
"find frame for func9"
|
|
}
|
|
|
|
# Finally, make the buffer circular. Now when it runs out of
|
|
# space, it should wrap around and overwrite the earliest frames.
|
|
# This means that:
|
|
# 1) the first frame will be overwritten and therefore unavailable.
|
|
# 2) the earliest frame in the buffer will not be for func0.
|
|
# 3) the frame for func9 will be available (unlike "small buffer" case).
|
|
with_test_prefix "circular buffer" {
|
|
clean_restart $testfile
|
|
|
|
if { ![runto_main] } {
|
|
fail "can't run to main"
|
|
return 1
|
|
}
|
|
|
|
gdb_test_no_output "set trace-buffer-size $buffer_size" \
|
|
"shrink the target trace buffer"
|
|
|
|
gdb_test_no_output "set circular-trace-buffer on" \
|
|
"make the target trace buffer circular"
|
|
|
|
run_trace_experiment
|
|
|
|
gdb_test "tstatus" \
|
|
".*Buffer contains $decimal trace frames \\(of $decimal created total\\).*Trace buffer is circular.*" \
|
|
"trace buffer is circular"
|
|
|
|
# The first frame should not be at func0.
|
|
gdb_test "tfind start" ".*#0 func\[1-9\] .*" \
|
|
"first frame is NOT at func0"
|
|
|
|
gdb_test \
|
|
"tfind pc func9" \
|
|
".*Found trace frame $decimal, tracepoint $decimal\r\n#0 func9 .*" \
|
|
"find frame for func9"
|
|
}
|