mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-30 12:44:10 +08:00
121b3efd49
This commit extends the CLI a bit for multi-target, in three ways. #1 - New "info connections" command. This is a new command that lists the open connections (process_stratum targets). For example, if you're debugging two remote connections, a couple local/native processes, and a core dump, all at the same time, you might see something like this: (gdb) info connections Num What Description 1 remote 192.168.0.1:9999 Remote serial target in gdb-specific protocol 2 remote 192.168.0.2:9998 Remote serial target in gdb-specific protocol * 3 native Native process 4 core Local core dump file #2 - New "info inferiors" "Connection" column You'll also see a new matching "Connection" column in "info inferiors", showing you which connection an inferior is bound to: (gdb) info inferiors Num Description Connection Executable 1 process 18526 1 (remote 192.168.0.1:9999) target:/tmp/a.out 2 process 18531 2 (remote 192.168.0.2:9998) target:/tmp/a.out 3 process 19115 3 (native) /tmp/prog1 4 process 6286 4 (core) myprogram * 5 process 19122 3 (native) /bin/hello #3 - Makes "add-inferior" show the inferior's target connection "add-inferior" now shows you the connection you've just bound the inferior to, which is the current process_stratum target: (gdb) add-inferior [New inferior 2] Added inferior 2 on connection 1 (extended-remote localhost:2346) gdb/ChangeLog: 2020-01-10 Pedro Alves <palves@redhat.com> * Makefile.in (COMMON_SFILES): Add target-connection.c. * inferior.c (uiout_field_connection): New function. (print_inferior): Add new "connection-id" column. (add_inferior_command): Show connection number/string of added inferior. * process-stratum-target.h (process_stratum_target::connection_string): New virtual method. (process_stratum_target::connection_number): New field. * remote.c (remote_target::connection_string): New override. * target-connection.c: New file. * target-connection.h: New file. * target.c (decref_target): Remove process_stratum targets from the connection list. (target_stack::push): Add process_stratum targets to the connection list. gdb/testsuite/ChangeLog: 2020-01-10 Pedro Alves <palves@redhat.com> * gdb.base/kill-detach-inferiors-cmd.exp: Adjust expected output of "add-inferior". * gdb.base/quit-live.exp: Likewise. * gdb.base/remote-exec-file.exp: Likewise. * gdb.guile/scm-progspace.exp: Likewise. * gdb.linespec/linespec.exp: Likewise. * gdb.mi/new-ui-mi-sync.exp: Likewise. * gdb.mi/user-selected-context-sync.exp: Likewise. * gdb.multi/multi-target.exp (setup): Add "info connection" and "info inferiors" tests. * gdb.multi/remove-inferiors.exp: Adjust expected output of "add-inferior". * gdb.multi/watchpoint-multi.exp: Likewise. * gdb.python/py-inferior.exp: Likewise. * gdb.server/extended-remote-restart.exp: Likewise. * gdb.threads/fork-plus-threads.exp: Adjust expected output of "info inferiors". * gdb.threads/forking-threads-plus-breakpoint.exp: Likewise. * gdb.trace/report.exp: Likewise.
121 lines
3.6 KiB
Plaintext
121 lines
3.6 KiB
Plaintext
# Copyright (C) 2015-2020 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/>.
|
|
|
|
# This test verifies that threads created by the child fork are
|
|
# properly handled. Specifically, GDB used to have a bug where it
|
|
# would leave child fork threads stuck stopped, even though "info
|
|
# threads" would show them running.
|
|
#
|
|
# See https://sourceware.org/bugzilla/show_bug.cgi?id=18600
|
|
|
|
# In remote mode, we cannot continue debugging after all
|
|
# inferiors have terminated, and this test requires that.
|
|
if { [target_info exists gdb_protocol]
|
|
&& [target_info gdb_protocol] == "remote" } {
|
|
continue
|
|
}
|
|
|
|
standard_testfile
|
|
|
|
proc do_test { detach_on_fork } {
|
|
global GDBFLAGS
|
|
global srcfile testfile
|
|
global gdb_prompt
|
|
|
|
set saved_gdbflags $GDBFLAGS
|
|
set GDBFLAGS [concat $GDBFLAGS " -ex \"set non-stop on\""]
|
|
|
|
if {[prepare_for_testing "failed to prepare" \
|
|
$testfile $srcfile {debug pthreads}] == -1} {
|
|
set GDBFLAGS $saved_gdbflags
|
|
return -1
|
|
}
|
|
|
|
set GDBFLAGS $saved_gdbflags
|
|
|
|
if ![runto_main] then {
|
|
fail "can't run to main"
|
|
return 0
|
|
}
|
|
|
|
gdb_test_no_output "set detach-on-fork $detach_on_fork"
|
|
set test "continue &"
|
|
gdb_test_multiple $test $test {
|
|
-re "$gdb_prompt " {
|
|
pass $test
|
|
}
|
|
}
|
|
|
|
# gdbserver had a bug that resulted in reporting the fork child's
|
|
# initial stop to gdb, which gdb does not expect, in turn
|
|
# resulting in a broken session, like:
|
|
#
|
|
# [Thread 31536.31536] #16 stopped. <== BAD
|
|
# [New Thread 31547.31547]
|
|
# [Inferior 10 (process 31536) exited normally]
|
|
# [New Thread 31547.31560]
|
|
#
|
|
# [Thread 31547.31547] #18 stopped. <== BAD
|
|
# Cannot remove breakpoints because program is no longer writable. <== BAD
|
|
# Further execution is probably impossible. <== BAD
|
|
# [Inferior 11 (process 31547) exited normally]
|
|
# [Inferior 1 (process 31454) exited normally]
|
|
#
|
|
# These variables track whether we see such broken behavior.
|
|
set saw_cannot_remove_breakpoints 0
|
|
set saw_thread_stopped 0
|
|
|
|
set test "inferior 1 exited"
|
|
gdb_test_multiple "" $test {
|
|
-re "Cannot remove breakpoints" {
|
|
set saw_cannot_remove_breakpoints 1
|
|
exp_continue
|
|
}
|
|
-re "Thread \[^\r\n\]+ stopped\\." {
|
|
set saw_thread_stopped 1
|
|
exp_continue
|
|
}
|
|
-re "Thread \[^\r\n\]+ exited" {
|
|
# Avoid timeout with check-read1
|
|
exp_continue
|
|
}
|
|
-re "New Thread \[^\r\n\]+" {
|
|
# Avoid timeout with check-read1
|
|
exp_continue
|
|
}
|
|
-re "Inferior 1 \(\[^\r\n\]+\) exited normally" {
|
|
pass $test
|
|
}
|
|
}
|
|
|
|
gdb_assert !$saw_cannot_remove_breakpoints \
|
|
"no failure to remove breakpoints"
|
|
gdb_assert !$saw_thread_stopped \
|
|
"no spurious thread stop"
|
|
|
|
gdb_test "info threads" "No threads\." \
|
|
"no threads left"
|
|
|
|
gdb_test "info inferiors" \
|
|
"Num\[ \t\]+Description\[ \t\]+Connection\[ \t\]+Executable\[ \t\]+\r\n\\* 1 \[^\r\n\]+" \
|
|
"only inferior 1 left"
|
|
}
|
|
|
|
foreach detach_on_fork {"on" "off"} {
|
|
with_test_prefix "detach-on-fork=$detach_on_fork" {
|
|
do_test $detach_on_fork
|
|
}
|
|
}
|