binutils-gdb/gdb/testsuite/gdb.server/extended-remote-restart.exp
Pedro Alves 121b3efd49 Add "info connections" command, "info inferiors" connection number/string
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.
2020-01-10 20:06:14 +00:00

138 lines
4.3 KiB
Text

# Copyright 2018-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 is about restarting execution of a forked application when
# using gdb extended remote target.
#
# There are two issues that the test tries to expose in GDB:
#
# 1. GDB would throw an assertion upon reconnecting to a remote target
# if there was more than one inferior already active in GDB, and
#
# 2. GDB would not prune transient inferiors from the inferior list
# when reconnecting to a remote target. So, for example, an inferior
# created by GDB to track the child of a fork would usually be removed
# from the inferior list once the child exited. However, reconnecting
# to a remote target would result in the child inferior remaining in
# the inferior list.
# This test is only for extended remote targets.
if {[target_info gdb_protocol] != "extended-remote"} {
continue
}
# This test also makes use of 'detach-on-fork' which is not supported
# on all platforms.
if { ![istarget "*-*-linux*"] && ![istarget "*-*-openbsd*"] } then {
continue
}
# And we need to be able to reconnect to gdbserver.
set gdbserver_reconnect_p 1
if { [info proc gdb_reconnect] == "" } {
return 0
}
standard_testfile
if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
return -1
}
# Core of the test. DO_KILL_P controls whether we kill one of the
# inferiors before reconnecting. And FOLLOW_CHILD_P controls whether
# we follow the child or the parent at the fork.
proc test_reload { do_kill_p follow_child_p } {
global decimal
global binfile
clean_restart ${binfile}
if ![runto_main] then {
fail "can't run to main"
return 0
}
# Set detach-on-fork off
gdb_test_no_output "set detach-on-fork off"
set live_inf_ptn "process $decimal"
set dead_inf_ptn "<null>"
if ${follow_child_p} {
gdb_test_no_output "set follow-fork child"
set parent_prefix " "
set child_prefix "\\*"
set parent_inf_after_kill_ptn ${live_inf_ptn}
set child_inf_after_kill_ptn ${dead_inf_ptn}
} else {
gdb_test_no_output "set follow-fork parent"
set parent_prefix "\\*"
set child_prefix " "
set parent_inf_after_kill_ptn ${dead_inf_ptn}
set child_inf_after_kill_ptn ${live_inf_ptn}
}
gdb_breakpoint "breakpt"
gdb_continue_to_breakpoint "breakpt"
set ws "\[ \t\]+"
set any_re "\[^\r\n\]+"
set connection_re $any_re
set executable_re $any_re
gdb_test "info inferiors" \
[multi_line \
" Num${ws}Description${ws}Connection${ws}Executable${ws}" \
"${parent_prefix} 1${ws}${live_inf_ptn}${ws}${connection_re}${executable_re}" \
"${child_prefix} 2${ws}${live_inf_ptn}${ws}${connection_re}${executable_re}" ] \
"Check inferiors at breakpoint"
if { $do_kill_p } {
# (Optional) Kill one of the inferiors.
gdb_test "kill" \
"" \
"Kill inferior" \
"Kill the program being debugged.*y or n. $" \
"y"
# Check the first inferior really did die.
gdb_test "info inferiors" \
[multi_line \
" Num${ws}Description${ws}Connection${ws}Executable${ws}" \
"${parent_prefix} 1${ws}${parent_inf_after_kill_ptn}${ws}${connection_re}${executable_re}" \
"${child_prefix} 2${ws}${child_inf_after_kill_ptn}${ws}${connection_re}${executable_re}" ] \
"Check inferior was killed"
}
# Disconnect, and reconnect to the target.
gdb_test "disconnect" ".*"
if { [gdb_reconnect] == 0 } {
pass "reconnect after fork"
} else {
fail "reconnect after fork"
}
}
# Run all combinations of the test.
foreach do_kill_p [list 1 0] {
foreach follow_child_p [list 1 0] {
with_test_prefix \
"kill: ${do_kill_p}, follow-child ${follow_child_p}" {
test_reload ${do_kill_p} ${follow_child_p}
}
}
}