This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[patch/testsuite/gdbserver] unsuspend lwps after step over
- From: Yao Qi <yao at codesourcery dot com>
- To: <gdb-patches at sourceware dot org>
- Date: Fri, 17 Feb 2012 10:29:19 +0800
- Subject: [patch/testsuite/gdbserver] unsuspend lwps after step over
Hi,
The test cases (gdb.trace/trace-break-mt.exp) in this patch is to
reproduce the assertion failure below,
continue^M
Continuing.^M
Remote connection closed^M
(gdb) FAIL: gdb.trace/trace-break-mt.exp: 1 trace on: continue to
set_point1 2
../../../gdb/gdb/gdbserver/linux-low.c:2801: A problem internal to
GDBserver has been detected.^M
stuck_in_jump_pad_callback: Assertion `lwp->suspended == 0' failed.^M
trace-break-mt.exp is a "multi-threaded" version of trace-break.exp.
This patch just decrements `suspended' flag before calling
stabilize_threads below. This part of code in gdbserver is quite new to
me, and comments are welcome.
Tested on x86_64-unknown-linux/native-gdbserver.
--
Yao (éå)
gdb/gdbserver:
2012-02-16 Yao Qi <yao@codesourcery.com>
* linux-low.c (linux_wait_1): Call unsuspend_all_lwps when
`step_over_finished' is true.
gdb/testsuite:
2012-02-16 Yao Qi <yao@codesourcery.com>
* gdb.trace/trace-break-mt.c: New
* gdb.trace/trace-break-mt.exp: New.
---
gdb/gdbserver/linux-low.c | 7 ++
gdb/testsuite/gdb.trace/trace-break-mt.c | 63 ++++++++++++++++
gdb/testsuite/gdb.trace/trace-break-mt.exp | 112 ++++++++++++++++++++++++++++
3 files changed, 182 insertions(+), 0 deletions(-)
create mode 100644 gdb/testsuite/gdb.trace/trace-break-mt.c
create mode 100644 gdb/testsuite/gdb.trace/trace-break-mt.exp
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index ab34d84..8fc178c 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -2481,6 +2481,13 @@ Check if we're already there.\n",
why. */
find_inferior (&all_lwps, cancel_breakpoints_callback, event_child);
+ /* If we just finished a step-over, all other threads had been
+ paused in function start_step_over. We have to unsuspend
+ them, say, decrement `suspended' flag, otherwise, we'll get
+ an assertion failure else where. */
+ if (step_over_finished)
+ unsuspend_all_lwps (event_child);
+
/* Stabilize threads (move out of jump pads). */
stabilize_threads ();
}
diff --git a/gdb/testsuite/gdb.trace/trace-break-mt.c b/gdb/testsuite/gdb.trace/trace-break-mt.c
new file mode 100644
index 0000000..90a5b54
--- /dev/null
+++ b/gdb/testsuite/gdb.trace/trace-break-mt.c
@@ -0,0 +1,63 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2012 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/>. */
+
+#include <pthread.h>
+
+#ifdef SYMBOL_PREFIX
+#define SYMBOL(str) SYMBOL_PREFIX #str
+#else
+#define SYMBOL(str) #str
+#endif
+/* Called from asm. */
+static void __attribute__((used))
+func (void)
+{}
+
+static void *
+thread_function(void *arg)
+{
+ /* `set_point1' is the label at which to set a fast tracepoint. The
+ insn at the label must be large enough to fit a fast tracepoint
+ jump. */
+ asm (" .global " SYMBOL(set_point1) "\n"
+ SYMBOL(set_point1) ":\n"
+#if (defined __x86_64__ || defined __i386__)
+ " call " SYMBOL(func) "\n"
+#endif
+ );
+}
+
+static void
+end (void)
+{}
+
+int
+main (int argc, char *argv[], char *envp[])
+{
+ pthread_t threads[2];
+ int i;
+
+ for (i = 0; i < 2; i++)
+ pthread_create (&threads[i], NULL, thread_function, NULL);
+
+ for (i = 0; i < 2; i++)
+ pthread_join (threads[i], NULL);
+
+ end ();
+
+ return 0;
+}
diff --git a/gdb/testsuite/gdb.trace/trace-break-mt.exp b/gdb/testsuite/gdb.trace/trace-break-mt.exp
new file mode 100644
index 0000000..47aef26
--- /dev/null
+++ b/gdb/testsuite/gdb.trace/trace-break-mt.exp
@@ -0,0 +1,112 @@
+# Copyright 2012 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 "trace-break-mt"
+set executable $testfile
+set srcfile $testfile.c
+set binfile $objdir/$subdir/$testfile
+set expfile $testfile.exp
+
+# Some targets have leading underscores on assembly symbols.
+set additional_flags [gdb_target_symbol_prefix_flags]
+
+if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
+ executable [list debug $additional_flags] ] != "" } {
+ untested itset.exp
+ return -1
+}
+
+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 "target does not support trace"
+ return -1
+}
+
+# Set breakpoint and tracepoint at the same address.
+
+proc break_trace_same_addr_1 { trace_type option } {
+ global executable
+ global pf_prefix
+ global hex
+
+ set old_pf_prefix $pf_prefix
+ set pf_prefix "$pf_prefix 1 $trace_type $option:"
+
+ # 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_no_output "set breakpoint always-inserted ${option}"
+
+ gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
+
+ gdb_test "break set_point1" "Breakpoint \[0-9\] at $hex: file.*"
+ gdb_test "${trace_type} set_point1" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*"
+
+ gdb_test_no_output "tstart"
+
+ gdb_test "continue" "Continuing\\.\[ \r\n\]+.*Breakpoint.*" "continue to set_point1 1"
+ gdb_test "continue" "Continuing\\.\[ \r\n\]+.*Breakpoint.*" "continue to set_point1 2"
+
+ gdb_test "continue" "Continuing\\.\[ \r\n\]+.*Breakpoint.*" "continue to end"
+ gdb_test_no_output "tstop"
+
+ gdb_test "tfind" "Found trace frame 0, tracepoint .*" "tfind frame 0"
+ gdb_test "tfind" "Found trace frame 1, tracepoint .*" "tfind frame 1"
+
+ gdb_test "tfind" "Target failed to find requested trace frame\\..*"
+
+ set pf_prefix $old_pf_prefix
+}
+
+foreach break_always_inserted { "on" "off" } {
+ break_trace_same_addr_1 "trace" ${break_always_inserted}
+}
+
+set libipa $objdir/../gdbserver/libinproctrace.so
+gdb_load_shlibs $libipa
+
+# Compile test case again with IPA.
+if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
+ executable [list debug $additional_flags shlib=$libipa] ] != "" } {
+ untested "failed to compile ftrace tests"
+ return -1
+}
+clean_restart ${executable}
+
+if ![runto_main] {
+ fail "Can't run to main for ftrace tests"
+ return 0
+}
+
+gdb_reinitialize_dir $srcdir/$subdir
+if { [gdb_test "info sharedlibrary" ".*libinproctrace\.so.*" "IPA loaded"] != 0 } {
+ untested "Could not find IPA lib loaded"
+} else {
+ foreach break_always_inserted { "on" "off" } {
+ break_trace_same_addr_1 "ftrace" ${break_always_inserted}
+ }
+}
--
1.7.0.4