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.
63 lines
2.2 KiB
Plaintext
63 lines
2.2 KiB
Plaintext
# This testcase is part of GDB, the GNU debugger.
|
|
#
|
|
# Copyright 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/>.
|
|
|
|
# Test the basic operation of the "kill inferiors" and "detach inferiors"
|
|
# commands.
|
|
|
|
if ![can_spawn_for_attach] {
|
|
return 0
|
|
}
|
|
|
|
standard_testfile
|
|
set executable $testfile
|
|
|
|
if [prepare_for_testing "failed to prepare" $executable] {
|
|
return -1
|
|
}
|
|
|
|
runto_main
|
|
|
|
# Add another forked inferior process.
|
|
gdb_test "add-inferior" "Added inferior 2 on connection .*" "add inferior 2"
|
|
gdb_test "inferior 2" "Switching to inferior 2.*"
|
|
gdb_test "file $binfile" "Reading symbols from .*" "load binary"
|
|
gdb_test "start" "Temporary breakpoint.*Starting program.*"
|
|
|
|
# Add an attached inferior process.
|
|
set test_spawn_id [spawn_wait_for_attach $binfile]
|
|
set test_pid [spawn_id_get_pid $test_spawn_id]
|
|
gdb_test "add-inferior" "Added inferior 3 on connection .*" "add inferior 3"
|
|
gdb_test "inferior 3" "Switching to inferior 3.*"
|
|
gdb_test "attach $test_pid" "Attaching to process.*" "attach to pid"
|
|
|
|
# Kill the first two inferiors, and detach the third.
|
|
gdb_test_no_output "kill inferiors 1 2"
|
|
gdb_test "inferior 1" "Switching to inferior 1.*"
|
|
gdb_test "kill" "The program is not being run.*"
|
|
gdb_test "detach inferiors 3" "Detaching from program.*process $test_pid.*"
|
|
|
|
# No inferiors should be running anymore.
|
|
gdb_test "kill inferiors 1 2 3" \
|
|
"ID 1 is not running.*ID 2 is not running.*ID 3 is not running.*"
|
|
gdb_test "detach inferiors 1 2 3" \
|
|
"ID 1 is not running.*ID 2 is not running.*ID 3 is not running.*"
|
|
|
|
gdb_test "kill inferiors 10" \
|
|
"ID 10 not known.*"
|
|
|
|
kill_wait_spawned_process $test_spawn_id
|