{
if (is_tracepoint (b))
{
- /* We need to verify that each top-level element of commands is
- valid for tracepoints, that there's at most one
- while-stepping element, and that while-stepping's body has
- valid tracing commands excluding nested while-stepping. */
+ struct tracepoint *t = (struct tracepoint *) b;
struct command_line *c;
struct command_line *while_stepping = 0;
+
+ /* Reset the while-stepping step count. The previous commands
+ might have included a while-stepping action, while the new
+ ones might not. */
+ t->step_count = 0;
+
+ /* We need to verify that each top-level element of commands is
+ valid for tracepoints, that there's at most one
+ while-stepping element, and that the while-stepping's body
+ has valid tracing commands excluding nested while-stepping.
+ We also need to validate the tracepoint action line in the
+ context of the tracepoint --- validate_actionline actually
+ has side effects, like setting the tracepoint's
+ while-stepping STEP_COUNT, in addition to checking if the
+ collect/teval actions parse and make sense in the
+ tracepoint's context. */
for (c = commands; c; c = c->next)
{
if (c->control_type == while_stepping_control)
else
while_stepping = c;
}
+
+ validate_actionline (c->line, b);
}
if (while_stepping)
{
--- /dev/null
+# Copyright 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]} {
+ return -1
+}
+
+proc test_actions_changed { } {
+ gdb_breakpoint "end"
+
+ gdb_test "trace subr" "Tracepoint .*" \
+ "tracepoint at subr"
+
+ # The first set of tests are regression tests for a GDB bug where
+ # the while-stepping count of a tracepoint would be left stale if
+ # the tracepoint's actions were redefined, and the new action list
+ # had no while-stepping action.
+
+ # First pass, define simple action.
+ with_test_prefix "1" {
+ gdb_trace_setactions "define simple action" \
+ "" \
+ "collect parm" "^$"
+
+ gdb_test_no_output "tstart"
+
+ gdb_test "continue" ".*Breakpoint \[0-9\]+, end \\(i=1\\) .*" \
+ "advance through tracing"
+
+ gdb_test "tstatus" ".*Collected 1 trace frame.*" \
+ "collected 1 trace frame"
+
+ gdb_test_no_output "tstop"
+ }
+
+ # Redefine action, run second trace.
+ with_test_prefix "2" {
+ gdb_trace_setactions "redefine simple action" \
+ "" \
+ "collect keeping, busy" "^$"
+
+ gdb_test_no_output "tstart"
+
+ gdb_test "continue" ".*Breakpoint \[0-9\]+, end \\(i=2\\) .*" \
+ "advance through tracing"
+
+ gdb_test "tstatus" ".*Collected 1 trace frame.*" \
+ "collected 1 trace frame"
+
+ gdb_test_no_output "tstop"
+ }
+
+ # Redefine to stepping action, run third trace.
+ with_test_prefix "3" {
+ gdb_trace_setactions "redefine to stepping action" \
+ "" \
+ "collect parm" "^$" \
+ "while-stepping 5" "^$" \
+ "collect parm" "^$" \
+ "end" "^$"
+
+ gdb_test_no_output "tstart"
+
+ gdb_test "continue" ".*Breakpoint \[0-9\]+, end \\(i=3\\) .*" \
+ "advance through tracing"
+
+ gdb_test "tstatus" ".*Collected 6 trace frames.*" \
+ "collected 6 trace frames"
+
+ gdb_test_no_output "tstop"
+ }
+
+ # Redefine to non-stepping, run fourth trace.
+ with_test_prefix "4" {
+ gdb_trace_setactions "redefine to non-stepping action" \
+ "" \
+ "collect parm" "^$"
+
+ gdb_test_no_output "tstart"
+
+ gdb_test "continue" ".*Breakpoint \[0-9\]+, end \\(i=4\\) .*" \
+ "advance through tracing"
+
+ gdb_test "tstatus" ".*Collected 1 trace frame.*" \
+ "collected 1 trace frame"
+
+ gdb_test_no_output "tstop"
+ }
+
+ # The following tests are related to the above, but use two
+ # tracepoints. They are regression tests for a GDB bug where only
+ # the first tracepoint would end up with the step count set.
+
+ # Store the first tracepoint's number.
+ gdb_test_no_output "set \$prev_tpnum=\$tpnum" "store previous \$tpnum"
+
+ # And here's the second tracepoint.
+ gdb_test "trace subr2" "Tracepoint .*" "tracepoint at subr2"
+
+ # Set a stepping action in both tracepoints, with the "commands"
+ # command.
+ with_test_prefix "5" {
+ gdb_trace_setcommands \
+ "redefine 2 tracepoints to stepping action, using commands" \
+ "\$prev_tpnum-\$tpnum" \
+ "collect parm" "^$" \
+ "while-stepping 5" "^$" \
+ "collect parm" "^$" \
+ "end" "^$"
+
+ gdb_test_no_output "tstart"
+
+ gdb_test "continue" ".*Breakpoint \[0-9\]+, end \\(i=5\\) .*" \
+ "advance through tracing"
+
+ gdb_test "tstatus" ".*Collected 12 trace frames.*" \
+ "collected 12 trace frames"
+
+ gdb_test_no_output "tstop"
+ }
+
+ # Redefine the actions of both tracepoints to non-stepping, also
+ # using the "commands" command.
+ with_test_prefix "6" {
+ gdb_trace_setcommands \
+ "redefine 2 tracepoints to non-stepping action, using commands" \
+ "\$prev_tpnum-\$tpnum" \
+ "collect parm" "^$"
+
+ gdb_test_no_output "tstart"
+
+ gdb_test "continue" ".*Breakpoint \[0-9\]+, end \\(i=6\\) .*" \
+ "advance through tracing"
+
+ gdb_test "tstatus" ".*Collected 2 trace frame.*" \
+ "collected 2 trace frames"
+
+ gdb_test_no_output "tstop"
+ }
+}
+
+# Check whether the target supports tracepoints.
+
+clean_restart $testfile
+
+if ![runto_main] {
+ fail "Can't run to main to check for trace support"
+ return -1
+}
+
+if ![gdb_target_supports_trace] {
+ unsupported "Current target does not support trace"
+ return -1;
+}
+
+test_actions_changed
+
+return 0
}
}
-#
-# Procedure: gdb_trace_setactions
# Define actions for a tracepoint.
# Arguments:
+# actions_command -- the command used to create the actions.
+# either "actions" or "commands".
# testname -- identifying string for pass/fail output
-# tracepoint -- to which tracepoint do these actions apply? (optional)
+# tracepoint -- to which tracepoint(s) do these actions apply? (optional)
# args -- list of actions to be defined.
# Returns:
# zero -- success
# non-zero -- failure
-proc gdb_trace_setactions { testname tracepoint args } {
+proc gdb_trace_setactions_command { actions_command testname tracepoint args } {
global gdb_prompt;
set state 0;
set passfail "pass";
- send_gdb "actions $tracepoint\n";
+ send_gdb "$actions_command $tracepoint\n";
set expected_result "";
gdb_expect 5 {
-re "No tracepoint number .*$gdb_prompt $" {
}
}
+# Define actions for a tracepoint, using the "actions" command. See
+# gdb_trace_setactions_command.
+#
+proc gdb_trace_setactions { testname tracepoint args } {
+ eval gdb_trace_setactions_command "actions" {$testname} {$tracepoint} $args
+}
+
+# Define actions for a tracepoint, using the "commands" command. See
+# gdb_trace_setactions_command.
+#
+proc gdb_trace_setcommands { testname tracepoint args } {
+ eval gdb_trace_setactions_command "commands" {$testname} {$tracepoint} $args
+}
+
#
# Procedure: gdb_tfind_test
# Find a specified trace frame.
projects / platform / upstream / binutils.git / commitdiff