2018-01-01 05:43:02 +01:00
|
|
|
# Copyright 2004-2018 Free Software Foundation, Inc.
|
2012-11-08 22:16:43 +01:00
|
|
|
|
|
|
|
# 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/>.
|
|
|
|
|
|
|
|
|
|
|
|
# Multi-threaded siginfo test.
|
|
|
|
|
|
|
|
if [target_info exists gdb,nosignals] {
|
|
|
|
verbose "Skipping siginfo-thread.exp because of nosignals."
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2015-06-24 15:53:03 +02:00
|
|
|
if { ![supports_get_siginfo_type] } {
|
2012-11-08 22:16:43 +01:00
|
|
|
verbose "Skipping siginfo-thread.exp because of lack of support."
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
standard_testfile .c
|
|
|
|
|
|
|
|
if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" \
|
|
|
|
"${binfile}" executable {debug}] != "" } {
|
|
|
|
return -1
|
|
|
|
}
|
|
|
|
|
|
|
|
clean_restart $binfile
|
|
|
|
|
|
|
|
# Advance to main
|
|
|
|
if { ![runto_main] } then {
|
|
|
|
gdb_suppress_tests
|
|
|
|
}
|
|
|
|
|
|
|
|
# Run to the signal.
|
Fix PR threads/19422 - show which thread caused stop
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.
2016-01-18 16:15:18 +01:00
|
|
|
gdb_test "continue" "Thread .* received signal SIGSEGV.*" "continue to signal"
|
2012-11-08 22:16:43 +01:00
|
|
|
|
|
|
|
# Try to generate a core file, for a later test.
|
|
|
|
set gcorefile [standard_output_file $testfile.gcore]
|
|
|
|
set gcore_created [gdb_gcore_cmd $gcorefile "save a core file"]
|
|
|
|
|
|
|
|
set ssi_addr ""
|
2016-12-01 21:40:05 +01:00
|
|
|
set test "extract si_addr"
|
2012-11-08 22:16:43 +01:00
|
|
|
gdb_test_multiple "p \$_siginfo" "$test" {
|
|
|
|
-re "si_addr = ($hex).*$gdb_prompt $" {
|
|
|
|
set ssi_addr $expect_out(1,string)
|
|
|
|
pass "$test"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-01 21:40:05 +01:00
|
|
|
set test "extract si_errno"
|
2012-11-08 22:16:43 +01:00
|
|
|
gdb_test_multiple "p \$_siginfo" "$test" {
|
|
|
|
-re "si_errno = (\[0-9\]\+).*$gdb_prompt $" {
|
|
|
|
set ssi_errno $expect_out(1,string)
|
|
|
|
pass "$test"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-01 21:40:05 +01:00
|
|
|
set test "extract si_code"
|
2012-11-08 22:16:43 +01:00
|
|
|
gdb_test_multiple "p \$_siginfo" "$test" {
|
|
|
|
-re "si_code = (\[0-9\]\+).*$gdb_prompt $" {
|
|
|
|
set ssi_code $expect_out(1,string)
|
|
|
|
pass "$test"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-01 21:40:05 +01:00
|
|
|
set test "extract si_signo"
|
2012-11-08 22:16:43 +01:00
|
|
|
gdb_test_multiple "p \$_siginfo" "$test" {
|
|
|
|
-re "si_signo = (\[0-9\]\+).*$gdb_prompt $" {
|
|
|
|
set ssi_signo $expect_out(1,string)
|
|
|
|
pass "$test"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
set bp_location [gdb_get_line_number "set breakpoint here"]
|
|
|
|
|
|
|
|
gdb_test "break $bp_location"
|
|
|
|
gdb_test "continue" ".* handler .*" "continue to handler"
|
|
|
|
|
|
|
|
gdb_test "p ssi_addr" " = \\(void \\*\\) $ssi_addr"
|
|
|
|
gdb_test "p ssi_errno" " = $ssi_errno"
|
|
|
|
gdb_test "p ssi_code" " = $ssi_code"
|
|
|
|
gdb_test "p ssi_signo" " = $ssi_signo"
|
|
|
|
|
|
|
|
gdb_test "thread 1" ".*"
|
|
|
|
# siginfo is available here -- it shows SIGSTOP -- so we test to make
|
|
|
|
# sure that we have a different signal from the SEGV thread.
|
|
|
|
gdb_test "p \$_siginfo.si_signo == $ssi_signo" " = 0" \
|
|
|
|
"test signal in main thread"
|
|
|
|
|
|
|
|
# Test siginfo preservation in core files.
|
|
|
|
if {$gcore_created} {
|
|
|
|
clean_restart $binfile
|
|
|
|
|
|
|
|
gdb_test "core $gcorefile" "Core was generated by.*" \
|
|
|
|
"core [file tail $gcorefile]"
|
|
|
|
|
|
|
|
gdb_test "p \$_siginfo.si_signo" " = $ssi_signo" \
|
|
|
|
"p \$_siginfo.si_signo from core file"
|
|
|
|
gdb_test "p \$_siginfo.si_errno" " = $ssi_errno" \
|
|
|
|
"p \$_siginfo.si_errno from core file"
|
|
|
|
gdb_test "p \$_siginfo.si_code" " = $ssi_code" \
|
|
|
|
"p \$_siginfo.si_code from core file"
|
|
|
|
gdb_test "p \$_siginfo._sifields._sigfault.si_addr" \
|
|
|
|
" = \\(void \\*\\) $ssi_addr" \
|
|
|
|
"p \$_siginfo._sifields._sigfault.si_addr from core file"
|
|
|
|
|
|
|
|
# We don't know which thread will be signalled, so we simply
|
|
|
|
# ensure that only one thread got a SEGV.
|
|
|
|
gdb_test_no_output "set variable \$count = 0"
|
|
|
|
foreach thread {1 2} {
|
|
|
|
gdb_test "thread $thread" ".*" "select thread $thread with core file"
|
|
|
|
gdb_test_no_output \
|
|
|
|
"set variable \$count += (\$_siginfo.si_signo == $ssi_signo)" \
|
|
|
|
"update counter in thread $thread"
|
|
|
|
}
|
|
|
|
gdb_test "print \$count" " = 1"
|
|
|
|
}
|