2011-12-10 Hui Zhu <teawater@gmail.com>

	    Yao Qi  <yao@codesourcery.com>

	* tracepoint.c (start_tracing): Clear `inserted' flag.

2011-12-10  Yao Qi  <yao@codesourcery.com>

	* gdb.trace/status-stop.exp: New.
	* gdb.trace/status-stop.c: New.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 704bbea0774f14114b192d20187ccd1767b1be27..13998f5c594e90c5ad4b3f360385d90b929fe16d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-10  Hui Zhu  <teawater@gmail.com>
+           Yao Qi  <yao@codesourcery.com>
+
+       * tracepoint.c (start_tracing): Clear `inserted' flag.
+
 2011-12-10  Hui Zhu  <teawater@gmail.com>
 
        * tracepoint.c (create_tsv_from_upload): Change sprintf to xstrprintf.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 13dc28212a8583829f39120ddc907b9bb4450d57..2035a8a4d66f0840538d5da341396315a380d360 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-10  Yao Qi  <yao@codesourcery.com>
+
+       * gdb.trace/status-stop.exp: New.
+       * gdb.trace/status-stop.c: New.
+
 2011-12-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * gdb.reverse/until-precsave.exp (run to end of main) Extend the

diff --git a/gdb/testsuite/gdb.trace/status-stop.c b/gdb/testsuite/gdb.trace/status-stop.c
new file mode 100644 (file)
index 0000000..9ff69d6
--- /dev/null
+++ b/gdb/testsuite/gdb.trace/status-stop.c
@@ -0,0 +1,48 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2011 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/>.  */
+
+static void
+func1 (void)
+{}
+
+int buf[1024];
+
+static void
+func2 (void)
+{}
+
+static void
+end (void)
+{}
+
+int
+main (void)
+{
+  int i;
+
+  func1 ();
+
+  /* We call func2 as many times as possible to make sure that trace is
+     stopped due to trace buffer is full.  */
+  for (i = 0; i < 10000; i++)
+    {
+      func2 ();
+    }
+
+  end ();
+  return 0;
+}

diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp
new file mode 100644 (file)
index 0000000..6c92b75
--- /dev/null
+++ b/gdb/testsuite/gdb.trace/status-stop.exp
@@ -0,0 +1,124 @@
+# Copyright 2011 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";
+
+set testfile "status-stop"
+set executable $testfile
+set srcfile ${testfile}.c
+set binfile $objdir/$subdir/$testfile
+set expfile $testfile.exp
+
+
+if [prepare_for_testing $expfile $executable $srcfile \
+        {debug nowarnings}] {
+    untested "failed to prepare for trace tests"
+    return -1
+}
+
+# Verify that the sequence of commands "tstart tstop tstart" works well.
+
+proc test_tstart_tstop_tstart { } {
+    global executable
+    global pf_prefix
+    global hex
+
+    set old_pf_prefix $pf_prefix
+    set pf_prefix "$pf_prefix tstart_tstop_tstart:"
+
+    # Start with a fresh gdb.
+    clean_restart ${executable}
+    if ![runto_main] {
+        fail "Can't run to main"
+        set pf_prefix $old_pf_prefix
+        return -1
+    }
+
+    gdb_test "trace func1" "Tracepoint \[0-9\] at $hex: file.*"
+    gdb_test_no_output "tstart"
+
+    gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end"
+
+    gdb_test_no_output "tstop"
+
+    gdb_test_no_output "tstart"
+
+    set pf_prefix $old_pf_prefix
+}
+
+# Verify the sequence of commands "tstart tstart" works well.
+
+proc test_tstart_tstart { } {
+    global executable
+    global pf_prefix
+    global hex
+
+    set old_pf_prefix $pf_prefix
+    set pf_prefix "$pf_prefix tstart_tstart:"
+
+    # Start with a fresh gdb.
+    clean_restart ${executable}
+    if ![runto_main] {
+        fail "Can't run to main"
+        set pf_prefix $old_pf_prefix
+        return -1
+    }
+
+    gdb_test "trace func1" "Tracepoint \[0-9\] at $hex: file.*"
+    gdb_test_no_output "tstart"
+
+    gdb_test "tstart" "" "tstart again" "A trace is running already.  Start a new run\\? \\(y or n\\) " "y"
+
+    set pf_prefix $old_pf_prefix
+}
+
+# Verify that trace stops clearly when trace buffer is full.
+
+proc test_buffer_full_tstart { } {
+    global executable
+    global pf_prefix
+    global hex
+
+    set old_pf_prefix $pf_prefix
+    set pf_prefix "$pf_prefix buffer_full_tstart:"
+
+    # Start with a fresh gdb.
+    clean_restart ${executable}
+    if ![runto_main] {
+        fail "Can't run to main"
+        set pf_prefix $old_pf_prefix
+        return -1
+    }
+
+    gdb_test "trace func2" "Tracepoint \[0-9\] at $hex: file.*"
+    gdb_trace_setactions "collect buf: define actions" \
+       "" \
+       "collect buf" "^$"
+
+    gdb_test_no_output "tstart"
+    gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end"
+
+    gdb_test "tstatus" ".*buffer was full.*"
+    gdb_test_no_output "tstart"
+
+    set old_pf_prefix $pf_prefix
+}
+
+test_tstart_tstop_tstart
+
+test_tstart_tstart
+
+test_buffer_full_tstart
\ No newline at end of file

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index fa79d53a4bd2c7beb512df18e31b80c948720b3c..79a64a3a27624ffb27c4903a5c8049ac0c231faf 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1756,6 +1756,10 @@ start_tracing (char *notes)
       struct tracepoint *t = (struct tracepoint *) b;
       struct bp_location *loc;
 
+      /* Clear `inserted' flag.  */
+      for (loc = b->loc; loc; loc = loc->next)
+       loc->inserted = 0;
+
       if ((b->type == bp_fast_tracepoint
           ? !may_insert_fast_tracepoints
           : !may_insert_tracepoints))