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.
86 lines
3.3 KiB
C++
86 lines
3.3 KiB
C++
/* Abstract base class inherited by all process_stratum targets
|
|
|
|
Copyright (C) 2018-2020 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
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/>. */
|
|
|
|
#ifndef PROCESS_STRATUM_TARGET_H
|
|
#define PROCESS_STRATUM_TARGET_H
|
|
|
|
#include "target.h"
|
|
|
|
/* Abstract base class inherited by all process_stratum targets. */
|
|
|
|
class process_stratum_target : public target_ops
|
|
{
|
|
public:
|
|
~process_stratum_target () override = 0;
|
|
|
|
strata stratum () const final override { return process_stratum; }
|
|
|
|
/* Return a string representation of this target's open connection.
|
|
This string is used to distinguish different instances of a given
|
|
target type. For example, when remote debugging, the target is
|
|
called "remote", but since we may have more than one remote
|
|
target open, connection_string() returns the connection serial
|
|
connection name, e.g., "localhost:10001", "192.168.0.1:20000",
|
|
etc. This string is shown in several places, e.g., in "info
|
|
connections" and "info inferiors". */
|
|
virtual const char *connection_string () { return nullptr; }
|
|
|
|
/* We must default these because they must be implemented by any
|
|
target that can run. */
|
|
bool can_async_p () override { return false; }
|
|
bool supports_non_stop () override { return false; }
|
|
bool supports_disable_randomization () override { return false; }
|
|
|
|
/* This default implementation returns the inferior's address
|
|
space. */
|
|
struct address_space *thread_address_space (ptid_t ptid) override;
|
|
|
|
/* This default implementation always returns target_gdbarch (). */
|
|
struct gdbarch *thread_architecture (ptid_t ptid) override;
|
|
|
|
/* Default implementations for process_stratum targets. Return true
|
|
if there's a selected inferior, false otherwise. */
|
|
bool has_all_memory () override;
|
|
bool has_memory () override;
|
|
bool has_stack () override;
|
|
bool has_registers () override;
|
|
bool has_execution (inferior *inf) override;
|
|
|
|
/* True if any thread is, or may be executing. We need to track
|
|
this separately because until we fully sync the thread list, we
|
|
won't know whether the target is fully stopped, even if we see
|
|
stop events for all known threads, because any of those threads
|
|
may have spawned new threads we haven't heard of yet. */
|
|
bool threads_executing = false;
|
|
|
|
/* The connection number. Visible in "info connections". */
|
|
int connection_number = 0;
|
|
};
|
|
|
|
/* Downcast TARGET to process_stratum_target. */
|
|
|
|
static inline process_stratum_target *
|
|
as_process_stratum_target (target_ops *target)
|
|
{
|
|
gdb_assert (target->stratum () == process_stratum);
|
|
return static_cast<process_stratum_target *> (target);
|
|
}
|
|
|
|
#endif /* !defined (PROCESS_STRATUM_TARGET_H) */
|