f303dbd60d
This commit changes GDB like this: - Program received signal SIGINT, Interrupt. + Thread 1 "main" received signal SIGINT, Interrupt. - Breakpoint 1 at 0x40087a: file threads.c, line 87. + Thread 3 "bar" hit Breakpoint 1 at 0x40087a: file threads.c, line 87. ... once the program goes multi-threaded. Until GDB sees a second thread spawn, the output is still the same as before, per the discussion back in 2012: https://www.sourceware.org/ml/gdb/2012-11/msg00010.html This helps non-stop mode, where you can't easily tell which thread hit a breakpoint or received a signal: (gdb) info threads Id Target Id Frame * 1 Thread 0x7ffff7fc1740 (LWP 19362) "main" (running) 2 Thread 0x7ffff7fc0700 (LWP 19366) "foo" (running) 3 Thread 0x7ffff77bf700 (LWP 19367) "bar" (running) (gdb) Program received signal SIGUSR1, User defined signal 1. 0x0000003616a09237 in pthread_join (threadid=140737353877248, thread_return=0x7fffffffd5b8) at pthread_join.c:92 92 lll_wait_tid (pd->tid); (gdb) b threads.c:87 Breakpoint 1 at 0x40087a: file threads.c, line 87. (gdb) Breakpoint 1, thread_function1 (arg=0x1) at threads.c:87 87 usleep (1); /* Loop increment. */ The best the user can do is run "info threads" and try to figure things out. It actually also affects all-stop mode, in case of "handle SIG print nostop": ... Program received signal SIGUSR1, User defined signal 1. Program received signal SIGUSR1, User defined signal 1. Program received signal SIGUSR1, User defined signal 1. Program received signal SIGUSR1, User defined signal 1. ... The above doesn't give any clue that these were different threads getting the SIGUSR1 signal. I initially thought of lowercasing "breakpoint" in "Thread 3 hit Breakpoint 1" but then after trying it I realized that leaving "Breakpoint" uppercase helps the eye quickly find the relevant information. It's also easier to implement not showing anything about threads until the program goes multi-threaded this way. Here's a larger example session in non-stop mode: (gdb) c -a& Continuing. (gdb) interrupt -a (gdb) Thread 1 "main" stopped. 0x0000003616a09237 in pthread_join (threadid=140737353877248, thread_return=0x7fffffffd5b8) at pthread_join.c:92 92 lll_wait_tid (pd->tid); Thread 2 "foo" stopped. 0x0000003615ebc6ed in nanosleep () at ../sysdeps/unix/syscall-template.S:81 81 T_PSEUDO (SYSCALL_SYMBOL, SYSCALL_NAME, SYSCALL_NARGS) Thread 3 "bar" stopped. 0x0000003615ebc6ed in nanosleep () at ../sysdeps/unix/syscall-template.S:81 81 T_PSEUDO (SYSCALL_SYMBOL, SYSCALL_NAME, SYSCALL_NARGS) b threads.c:87 Breakpoint 4 at 0x40087a: file threads.c, line 87. (gdb) b threads.c:67 Breakpoint 5 at 0x400811: file threads.c, line 67. (gdb) c -a& Continuing. (gdb) Thread 3 "bar" hit Breakpoint 4, thread_function1 (arg=0x1) at threads.c:87 87 usleep (1); /* Loop increment. */ Thread 2 "foo" hit Breakpoint 5, thread_function0 (arg=0x0) at threads.c:68 68 (*myp) ++; info threads Id Target Id Frame * 1 Thread 0x7ffff7fc1740 (LWP 31957) "main" (running) 2 Thread 0x7ffff7fc0700 (LWP 31961) "foo" thread_function0 (arg=0x0) at threads.c:68 3 Thread 0x7ffff77bf700 (LWP 31962) "bar" thread_function1 (arg=0x1) at threads.c:87 (gdb) shell kill -SIGINT 31957 (gdb) Thread 1 "main" received signal SIGINT, Interrupt. 0x0000003616a09237 in pthread_join (threadid=140737353877248, thread_return=0x7fffffffd5b8) at pthread_join.c:92 92 lll_wait_tid (pd->tid); info threads Id Target Id Frame * 1 Thread 0x7ffff7fc1740 (LWP 31957) "main" 0x0000003616a09237 in pthread_join (threadid=140737353877248, thread_return=0x7fffffffd5b8) at pthread_join.c:92 2 Thread 0x7ffff7fc0700 (LWP 31961) "foo" thread_function0 (arg=0x0) at threads.c:68 3 Thread 0x7ffff77bf700 (LWP 31962) "bar" thread_function1 (arg=0x1) at threads.c:87 (gdb) t 2 [Switching to thread 2, Thread 0x7ffff7fc0700 (LWP 31961)] #0 thread_function0 (arg=0x0) at threads.c:68 68 (*myp) ++; (gdb) catch syscall Catchpoint 6 (any syscall) (gdb) c& Continuing. (gdb) Thread 2 "foo" hit Catchpoint 6 (call to syscall nanosleep), 0x0000003615ebc6ed in nanosleep () at ../sysdeps/unix/syscall-template.S:81 81 T_PSEUDO (SYSCALL_SYMBOL, SYSCALL_NAME, SYSCALL_NARGS) I'll work on documentation next if this looks agreeable. This patch applies on top of the star wildcards thread IDs series: https://sourceware.org/ml/gdb-patches/2016-01/msg00291.html For convenience, I've pushed this to the users/palves/show-which-thread-caused-stop branch. gdb/doc/ChangeLog: 2016-01-18 Pedro Alves <palves@redhat.com> * gdb.texinfo (Threads): Mention that GDB displays the ID and name of the thread that hit a breakpoint or received a signal. gdb/ChangeLog: 2016-01-18 Pedro Alves <palves@redhat.com> * NEWS: Mention that GDB now displays the ID and name of the thread that hit a breakpoint or received a signal. * break-catch-sig.c (signal_catchpoint_print_it): Use maybe_print_thread_hit_breakpoint. * break-catch-syscall.c (print_it_catch_syscall): Likewise. * break-catch-throw.c (print_it_exception_catchpoint): Likewise. * breakpoint.c (maybe_print_thread_hit_breakpoint): New function. (print_it_catch_fork, print_it_catch_vfork, print_it_catch_solib) (print_it_catch_exec, print_it_ranged_breakpoint) (print_it_watchpoint, print_it_masked_watchpoint, bkpt_print_it): Use maybe_print_thread_hit_breakpoint. * breakpoint.h (maybe_print_thread_hit_breakpoint): Declare. * gdbthread.h (show_thread_that_caused_stop): Declare. * infrun.c (print_signal_received_reason): Print which thread received signal. * thread.c (show_thread_that_caused_stop): New function. gdb/testsuite/ChangeLog: 2016-01-18 Pedro Alves <palves@redhat.com> * gdb.base/async-shell.exp: Adjust expected output. * gdb.base/dprintf-non-stop.exp: Adjust expected output. * gdb.base/siginfo-thread.exp: Adjust expected output. * gdb.base/watchpoint-hw-hit-once.exp: Adjust expected output. * gdb.java/jnpe.exp: Adjust expected output. * gdb.threads/clone-new-thread-event.exp: Adjust expected output. * gdb.threads/continue-pending-status.exp: Adjust expected output. * gdb.threads/leader-exit.exp: Adjust expected output. * gdb.threads/manythreads.exp: Adjust expected output. * gdb.threads/pthreads.exp: Adjust expected output. * gdb.threads/schedlock.exp: Adjust expected output. * gdb.threads/siginfo-threads.exp: Adjust expected output. * gdb.threads/signal-command-multiple-signals-pending.exp: Adjust expected output. * gdb.threads/signal-delivered-right-thread.exp: Adjust expected output. * gdb.threads/sigthread.exp: Adjust expected output. * gdb.threads/watchpoint-fork.exp: Adjust expected output.
144 lines
5.5 KiB
Text
144 lines
5.5 KiB
Text
# Copyright 2012-2016 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/>.
|
|
|
|
# Test case for forgotten hw-watchpoints after fork()-off of a process.
|
|
|
|
set testfile watchpoint-fork
|
|
|
|
proc test {type symbol} {
|
|
with_test_prefix "$type" {
|
|
global testfile subdir srcdir gdb_prompt
|
|
|
|
set srcfile_type ${srcdir}/${subdir}/${testfile}-${type}.c
|
|
|
|
# no threads
|
|
|
|
with_test_prefix "singlethreaded" {
|
|
set executable ${testfile}-${type}-st
|
|
set srcfile_main ${testfile}-st.c
|
|
if {[build_executable $testfile.exp $executable \
|
|
[list $srcfile_main ${testfile}-${type}.c] \
|
|
[list debug additional_flags=-D$symbol]] == -1} {
|
|
return -1
|
|
}
|
|
|
|
clean_restart $executable
|
|
|
|
if [target_info exists gdb,no_hardware_watchpoints] {
|
|
# The software watchpoint functionality is in GDB an unrelated test.
|
|
gdb_test_no_output "set can-use-hw-watchpoints 0"
|
|
}
|
|
|
|
gdb_test "show detach-on-fork" "Whether gdb will detach the child of a fork is on\\."
|
|
gdb_test_no_output "set follow-fork-mode $type"
|
|
gdb_test "show follow-fork-mode" "Debugger response to a program call of fork or vfork is \"$type\"\\."
|
|
# Testcase uses it for the `follow-fork-mode child' type.
|
|
gdb_test "handle SIGUSR1 nostop noprint pass" "No\[ \t\]+No\[ \t\]+Yes.*"
|
|
|
|
if ![runto_main] {
|
|
return
|
|
}
|
|
|
|
gdb_test "watch var" "atchpoint \[0-9\]+: var" "Set the watchpoint"
|
|
|
|
# It is never hit but it should not be left over in the fork()ed-off child.
|
|
if [skip_hw_breakpoint_tests] {
|
|
set hbreak "break"
|
|
} else {
|
|
set hbreak "hbreak"
|
|
}
|
|
gdb_test "$hbreak marker"
|
|
|
|
gdb_breakpoint "mark_exit"
|
|
|
|
gdb_test "continue" \
|
|
"reakpoint \[0-9\]+, marker.*" "hardware breakpoints work"
|
|
gdb_test "continue" \
|
|
"atchpoint \[0-9\]+: var.*Old value = 0.*New value = 1.*forkoff *\\(1\\).*" "watchpoints work"
|
|
gdb_test "continue" \
|
|
"reakpoint \[0-9\]+, marker.*" "breakpoint after the first fork"
|
|
gdb_test "continue" \
|
|
"atchpoint \[0-9\]+: var.*Old value = 1.*New value = 2.*forkoff *\\(2\\).*" "watchpoint after the first fork"
|
|
gdb_test "continue" \
|
|
"reakpoint \[0-9\]+, marker.*" "breakpoint after the second fork"
|
|
gdb_test "continue" \
|
|
"atchpoint \[0-9\]+: var.*Old value = 2.*New value = 3.*mark_exit \\(\\);" "watchpoint after the second fork"
|
|
gdb_test "continue" "Continuing\\..*\r\n(Thread .* hit )?Breakpoint \[0-9\]+, mark_exit .*" "finish"
|
|
}
|
|
|
|
# threads
|
|
|
|
if [target_info exists gdb,no_hardware_watchpoints] {
|
|
# Watchpoint hits would get detected in unexpected threads.
|
|
return
|
|
}
|
|
|
|
with_test_prefix "multithreaded" {
|
|
set executable ${testfile}-${type}-mt
|
|
set srcfile_main ${srcdir}/${subdir}/${testfile}-mt.c
|
|
if { [gdb_compile_pthreads "${srcfile_main} ${srcfile_type}" [standard_output_file ${executable}] executable [list debug "additional_flags=-D$symbol -DTHREAD"]] != "" } {
|
|
untested ${testfile}.exp
|
|
return
|
|
}
|
|
clean_restart $executable
|
|
|
|
gdb_test_no_output "set follow-fork-mode $type"
|
|
# Testcase uses it for the `follow-fork-mode child' type.
|
|
gdb_test "handle SIGUSR1 nostop noprint pass" "No\[ \t\]+No\[ \t\]+Yes.*"
|
|
|
|
if ![runto_main] {
|
|
return
|
|
}
|
|
|
|
gdb_test "watch var" "atchpoint \[0-9\]+: var" "Set the watchpoint"
|
|
|
|
# It should not be left over in the fork()ed-off child.
|
|
gdb_test "$hbreak marker" {reakpoint [0-9]+.*}
|
|
|
|
gdb_breakpoint "mark_exit"
|
|
|
|
gdb_test "continue" \
|
|
"reakpoint \[0-9\]+, marker.*" "hardware breakpoints work"
|
|
gdb_test "continue" \
|
|
"atchpoint \[0-9\]+: var.*Old value = 0.*New value = 1.*validity-first.*" "singlethread watchpoints work"
|
|
gdb_test "continue" \
|
|
"atchpoint \[0-9\]+: var.*Old value = 1.*New value = 2.*validity-thread-A.*" "multithreaded watchpoints work at A"
|
|
gdb_test "continue" \
|
|
"atchpoint \[0-9\]+: var.*Old value = 2.*New value = 3.*validity-thread-B.*" "multithreaded watchpoints work at B"
|
|
gdb_test "continue" \
|
|
"reakpoint \[0-9\]+, marker.*" "breakpoint (A) after the first fork"
|
|
gdb_test "continue" \
|
|
"atchpoint \[0-9\]+: var.*Old value = 3.*New value = 4.*after-fork1-A.*" "watchpoint A after the first fork"
|
|
gdb_test "continue" \
|
|
"atchpoint \[0-9\]+: var.*Old value = 4.*New value = 5.*after-fork1-B.*" "watchpoint B after the first fork"
|
|
gdb_test "continue" \
|
|
"reakpoint \[0-9\]+, marker.*" "breakpoint (A) after the second fork"
|
|
gdb_test "continue" \
|
|
"atchpoint \[0-9\]+: var.*Old value = 5.*New value = 6.*after-fork2-A.*" "watchpoint A after the second fork"
|
|
gdb_test "continue" \
|
|
"atchpoint \[0-9\]+: var.*Old value = 6.*New value = 7.*after-fork2-B.*" "watchpoint B after the second fork"
|
|
gdb_test "continue" "Continuing\\..*\r\nThread .* hit Breakpoint \[0-9\]+, mark_exit .*" "finish"
|
|
}
|
|
}
|
|
}
|
|
|
|
test parent FOLLOW_PARENT
|
|
|
|
# Only GNU/Linux is known to support `set follow-fork-mode child'.
|
|
if [istarget "*-*-linux*"] {
|
|
test child FOLLOW_CHILD
|
|
} else {
|
|
untested "${testfile}: child"
|
|
}
|