From: Simon Farre <simon.farre.cx@gmail.com>
To: gdb-patches@sourceware.org
Cc: Simon Farre <simon.farre.cx@gmail.com>
Subject: [PATCH v2] gdb/dap - Add support for additional target types
Date: Tue, 13 Jun 2023 14:06:28 +0200 [thread overview]
Message-ID: <20230613120628.49014-1-simon.farre.cx@gmail.com> (raw)
v2.
Forgot to add new file to Makefile
Adds support for extended-remote configuration. Initial work
was really just adding 2-3 lines that checked for extended-remote
but I figured this design makes it trivial to add the remaining target
types and this design also is self-documenting.
For remaining types, add the type to target requirements and the
required field(s) for it and in parse_target add branch for what result
it should be parsed into.
---
gdb/data-directory/Makefile.in | 1 +
gdb/python/lib/gdb/dap/__init__.py | 1 +
gdb/python/lib/gdb/dap/attach.py | 72 ++++++++++++++++++++++++++++++
gdb/python/lib/gdb/dap/launch.py | 20 +--------
4 files changed, 75 insertions(+), 19 deletions(-)
create mode 100644 gdb/python/lib/gdb/dap/attach.py
diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
index a3775a4a666..0b204a93ff7 100644
--- a/gdb/data-directory/Makefile.in
+++ b/gdb/data-directory/Makefile.in
@@ -95,6 +95,7 @@ PYTHON_FILE_LIST = \
gdb/dap/frames.py \
gdb/dap/__init__.py \
gdb/dap/io.py \
+ gdb/dap/attach.py \
gdb/dap/launch.py \
gdb/dap/locations.py \
gdb/dap/memory.py \
diff --git a/gdb/python/lib/gdb/dap/__init__.py b/gdb/python/lib/gdb/dap/__init__.py
index f3dd3ff7ea8..9e8a8566e56 100644
--- a/gdb/python/lib/gdb/dap/__init__.py
+++ b/gdb/python/lib/gdb/dap/__init__.py
@@ -25,6 +25,7 @@ from . import bt
from . import disassemble
from . import evaluate
from . import launch
+from . import attach
from . import locations
from . import memory
from . import next
diff --git a/gdb/python/lib/gdb/dap/attach.py b/gdb/python/lib/gdb/dap/attach.py
new file mode 100644
index 00000000000..6f36b4fbe3f
--- /dev/null
+++ b/gdb/python/lib/gdb/dap/attach.py
@@ -0,0 +1,72 @@
+# 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/>.
+
+import gdb
+
+# These are deprecated in 3.9, but required in older versions.
+from typing import Optional
+
+from .server import request
+from .startup import send_gdb_with_response
+
+
+# To add targets in the future: add required parameters set to their type
+target_type_requirements = {}
+target_type_requirements["remote"] = {"address"}
+target_type_requirements["extended-remote"] = {"address"}
+
+def check_target_requirements(target: dict[str]):
+ global target_type_requirements
+ type = target.get("type")
+ if type is None or target_type_requirements.get(type) is None:
+ supported = list(target_type_requirements.keys())
+ raise Exception("'type' field incorrect or missing. Supported types {}"
+ .format(supported))
+
+ # If requirements is a subset of target; all requirements met
+ if not (target_type_requirements[type] <= target.keys()):
+ missing = target_type_requirements[type] - target.keys()
+ raise Exception("Required fields missing: {}".format(list(missing)))
+
+def parse_target(target: dict[str]) -> str:
+ check_target_requirements(target)
+ type = target["type"]
+ if type == "extended-remote" or type == "remote":
+ addr = target["address"]
+ return "target {} {}".format(type, addr)
+
+ # We should never reach this; check_target_requirements make sure of that.
+ raise gdb.GdbError("Attach configuration parsing failed")
+
+@request("attach")
+def attach(
+ *,
+ pid: Optional[int] = None,
+ target: Optional[dict] = None,
+ **args
+):
+ # Ensure configurationDone does not try to run (in launch.py)
+ global _program
+ _program = None
+ if pid is not None:
+ cmd = "attach " + str(pid)
+ elif target is not None:
+ cmd = parse_target(target)
+ else:
+ raise Exception("attach requires either 'pid' or 'target' fields")
+ # Use send_gdb_with_response to ensure we get an error if the
+ # attach fails.
+ send_gdb_with_response(cmd)
+ return None
diff --git a/gdb/python/lib/gdb/dap/launch.py b/gdb/python/lib/gdb/dap/launch.py
index c3c09bc3dd0..031bd2dcde5 100644
--- a/gdb/python/lib/gdb/dap/launch.py
+++ b/gdb/python/lib/gdb/dap/launch.py
@@ -20,12 +20,11 @@ from typing import Mapping, Optional, Sequence
from .events import ExecutionInvoker
from .server import request, capability
-from .startup import send_gdb, send_gdb_with_response, in_gdb_thread, exec_and_log
+from .startup import send_gdb, in_gdb_thread, exec_and_log
_program = None
-
@in_gdb_thread
def _set_args_env(args, env):
inf = gdb.selected_inferior()
@@ -66,23 +65,6 @@ def launch(
send_gdb(lambda: _set_args_env(args, env))
-@request("attach")
-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(cmd)
- return None
-
-
@capability("supportsConfigurationDoneRequest")
@request("configurationDone")
def config_done(**args):
--
2.40.1
next reply other threads:[~2023-06-13 12:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 12:06 Simon Farre [this message]
2023-06-13 18:32 ` Tom Tromey
2023-06-14 10:54 ` Simon Farre
2023-06-14 11:56 ` Andrew Burgess
2023-06-14 12:01 ` Simon Farre
2023-06-20 10:00 Simon Farre
2023-06-20 14:02 ` 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=20230613120628.49014-1-simon.farre.cx@gmail.com \
--to=simon.farre.cx@gmail.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).