From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 21/25] Add "target" parameter to DAP attach request
Date: Wed, 24 May 2023 10:37:12 -0600 [thread overview]
Message-ID: <20230427-ada-catch-exception-v1-21-947caa9905e3@adacore.com> (raw)
In-Reply-To: <20230427-ada-catch-exception-v1-0-947caa9905e3@adacore.com>
This adds a new "target" to the DAP attach request. This is passed to
"target remote". I thought "attach" made the most sense for this,
because in some sense gdb is attaching to a running process. It's
worth noting that all DAP "attach" parameters are defined by the
implementation.
---
gdb/doc/gdb.texinfo | 8 ++++--
gdb/python/lib/gdb/dap/launch.py | 10 ++++++--
gdb/testsuite/gdb.dap/remote-dap.exp | 49 ++++++++++++++++++++++++++++++++++++
gdb/testsuite/lib/dap-support.exp | 11 ++++++++
4 files changed, 74 insertions(+), 4 deletions(-)
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 1b967485bc6..f66dd4df3cf 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -39020,12 +39020,16 @@ If provided, this is a string that specifies the program to use. This
corresponds to the @code{file} command. @xref{Files}.
@end table
-@value{GDBN} defines a parameter that can be passed to the
-@code{attach} request:
+@value{GDBN} defines some parameters that can be passed to the
+@code{attach} request. One of these must be specified.
@table @code
@item pid
The process ID to which @value{GDBN} should attach. @xref{Attach}.
+
+@item target
+The target to which @value{GDBN} should connect. This is a string and
+is passed to the @code{target remote} command. @xref{Connecting}.
@end table
@node JIT Interface
diff --git a/gdb/python/lib/gdb/dap/launch.py b/gdb/python/lib/gdb/dap/launch.py
index e187c3144d7..2fec3267cbb 100644
--- a/gdb/python/lib/gdb/dap/launch.py
+++ b/gdb/python/lib/gdb/dap/launch.py
@@ -56,13 +56,19 @@ def launch(
@request("attach")
-def attach(*, pid: int, **args):
+def attach(*, pid: Optional[int] = None, target: Optional[str] = None, **args):
# Ensure configurationDone does not try to run.
global _program
_program = None
+ if pid is not None:
+ cmd = "attach " + str(pid)
+ elif target is not None:
+ cmd = "target remote " + target
+ else:
+ raise Exception("attach requires either 'pid' or 'target'")
# Use send_gdb_with_response to ensure we get an error if the
# attach fails.
- send_gdb_with_response("attach " + str(pid))
+ send_gdb_with_response(cmd)
return None
diff --git a/gdb/testsuite/gdb.dap/remote-dap.exp b/gdb/testsuite/gdb.dap/remote-dap.exp
new file mode 100644
index 00000000000..33524082051
--- /dev/null
+++ b/gdb/testsuite/gdb.dap/remote-dap.exp
@@ -0,0 +1,49 @@
+# Copyright 2023 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 "attach" with a remote target in DAP.
+
+load_lib gdbserver-support.exp
+load_lib dap-support.exp
+
+require allow_dap_tests allow_gdbserver_tests
+# We want to have control over where we start gdbserver.
+require {!is_remote target}
+
+# This test is only for remote targets.
+if {[target_info exists gdb_protocol]
+ && [target_info gdb_protocol] != "remote"} {
+ unsupported "requires remote"
+ return
+}
+
+standard_testfile attach.c
+
+if {[build_executable ${testfile}.exp $testfile $srcfile] == -1} {
+ return
+}
+
+set target_exec [gdb_remote_download target [standard_output_file $testfile]]
+
+lassign [gdbserver_start "" $target_exec] protocol port
+# Really should have been caught up above.
+gdb_assert {$protocol == "remote"}
+
+# We just want to test that attaching works at all.
+if {[dap_target_remote $port] != ""} {
+ dap_shutdown true
+}
+
+close_gdbserver
diff --git a/gdb/testsuite/lib/dap-support.exp b/gdb/testsuite/lib/dap-support.exp
index 5c547480d09..e1fada8b703 100644
--- a/gdb/testsuite/lib/dap-support.exp
+++ b/gdb/testsuite/lib/dap-support.exp
@@ -283,6 +283,17 @@ proc dap_attach {pid} {
[format {o pid [i %s]} $pid]]
}
+# Start gdb, send a DAP initialize request, and then an attach request
+# specifying TARGET as the remote target. Returns the empty string on
+# failure, or the response object from the attach request.
+proc dap_target_remote {target} {
+ if {[_dap_initialize "startup - initialize"] == ""} {
+ return ""
+ }
+ return [dap_check_request_and_response "startup - target" attach \
+ [format {o target [s %s]} $target]]
+}
+
# Cleanly shut down gdb. TERMINATE is passed as the terminateDebuggee
# parameter to the request.
proc dap_shutdown {{terminate false}} {
--
2.40.0
next prev parent reply other threads:[~2023-05-24 16:37 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 16:36 [PATCH 00/25] Many updates to DAP implementation Tom Tromey
2023-05-24 16:36 ` [PATCH 01/25] Stop gdb in gnat_runtime_has_debug_info Tom Tromey
2023-05-24 16:36 ` [PATCH 02/25] Use gnat_runtime_has_debug_info in Ada catchpoint tests Tom Tromey
2023-06-13 20:10 ` Tom de Vries
2023-06-19 9:49 ` Tom de Vries
2023-06-20 13:56 ` Tom Tromey
2023-05-24 16:36 ` [PATCH 03/25] Pass tempflag to ada_catchpoint constructor Tom Tromey
2023-05-24 16:36 ` [PATCH 04/25] Transfer ownership of exception string to ada_catchpoint Tom Tromey
2023-05-24 16:36 ` [PATCH 05/25] Combine create_excep_cond_exprs and ada_catchpoint::re_set Tom Tromey
2023-05-24 16:36 ` [PATCH 06/25] Turn should_stop_exception into a method of ada_catchpoint Tom Tromey
2023-05-24 16:36 ` [PATCH 07/25] Mark members of ada_catchpoint "private" Tom Tromey
2023-05-24 16:36 ` [PATCH 08/25] Don't require inferior execution for Ada catchpoints Tom Tromey
2023-05-24 16:37 ` [PATCH 09/25] Implement DAP setExceptionBreakpoints request Tom Tromey
2023-05-24 16:37 ` [PATCH 10/25] Implement DAP attach request Tom Tromey
2023-05-24 16:53 ` Eli Zaretskii
2023-05-24 16:37 ` [PATCH 11/25] Implement DAP stepOut request Tom Tromey
2023-05-24 16:37 ` [PATCH 12/25] Add singleThread support to some DAP requests Tom Tromey
2023-05-24 16:37 ` [PATCH 13/25] Rename one DAP function Tom Tromey
2023-05-24 16:37 ` [PATCH 14/25] Add test for DAP pause request Tom Tromey
2023-05-24 16:37 ` [PATCH 15/25] Fix a latent bug in DAP request decorator Tom Tromey
2023-05-24 16:37 ` [PATCH 16/25] Use tuples for default arguments in DAP Tom Tromey
2023-05-24 16:37 ` [PATCH 17/25] Add type-checking to DAP requests Tom Tromey
2023-05-24 16:37 ` [PATCH 18/25] Add gdb.Value.assign method Tom Tromey
2023-05-24 16:54 ` Eli Zaretskii
2023-05-24 16:37 ` [PATCH 19/25] Implement DAP setExpression request Tom Tromey
2023-05-24 16:37 ` [PATCH 20/25] Handle DAP supportsVariableType capability Tom Tromey
2023-05-24 16:37 ` Tom Tromey [this message]
2023-05-24 16:55 ` [PATCH 21/25] Add "target" parameter to DAP attach request Eli Zaretskii
2023-05-24 16:37 ` [PATCH 22/25] Add "stop at main" extension to DAP launch request Tom Tromey
2023-05-24 16:56 ` Eli Zaretskii
2023-05-24 16:37 ` [PATCH 23/25] Implement DAP breakpointLocations request Tom Tromey
2023-05-24 16:37 ` [PATCH 24/25] Do not report totalFrames from DAP stackTrace request Tom Tromey
2023-05-24 16:37 ` [PATCH 25/25] Implement DAP conditional breakpoints Tom Tromey
2023-06-12 18:11 ` [PATCH 00/25] Many updates to DAP implementation Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230427-ada-catch-exception-v1-21-947caa9905e3@adacore.com \
--to=tromey@adacore.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).