From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 5/6] Catch BaseException in send_gdb_with_response
Date: Fri, 01 Dec 2023 08:41:01 -0700 [thread overview]
Message-ID: <20231201-dap-cancel-v1-5-872022fc328a@adacore.com> (raw)
In-Reply-To: <20231201-dap-cancel-v1-0-872022fc328a@adacore.com>
Cancellation will generally be seen by the DAP code as a
KeyboardInterrupt. However, this derives from BaseException and not
Exception, so a small change is needed to send_gdb_with_response, to
forward the exception to the DAP server thread.
---
gdb/python/lib/gdb/dap/startup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gdb/python/lib/gdb/dap/startup.py b/gdb/python/lib/gdb/dap/startup.py
index a16b51f7cf5..1a7ec17e5e3 100644
--- a/gdb/python/lib/gdb/dap/startup.py
+++ b/gdb/python/lib/gdb/dap/startup.py
@@ -172,11 +172,11 @@ def send_gdb_with_response(fn):
try:
val = fn()
result_q.put(val)
- except Exception as e:
+ except BaseException as e:
result_q.put(e)
send_gdb(message)
val = result_q.get()
- if isinstance(val, Exception):
+ if isinstance(val, BaseException):
raise val
return val
--
2.41.0
next prev parent reply other threads:[~2023-12-01 15:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-01 15:40 [PATCH 0/6] Implement DAP cancellation Tom Tromey
2023-12-01 15:40 ` [PATCH 1/6] Clean up handling of DAP not-stopped response Tom Tromey
2023-12-01 15:40 ` [PATCH 2/6] Move DAP JSON reader to its own thread Tom Tromey
2023-12-01 15:40 ` [PATCH 3/6] Introduce gdb.interrupt Tom Tromey
2023-12-01 15:56 ` Eli Zaretskii
2023-12-11 15:49 ` Tom Tromey
2023-12-01 15:41 ` [PATCH 4/6] Rename a couple of DAP procs in the testsuite Tom Tromey
2023-12-01 15:41 ` Tom Tromey [this message]
2023-12-01 16:29 ` [PATCH 5/6] Catch BaseException in send_gdb_with_response Kévin Le Gouguec
2023-12-01 17:51 ` Tom Tromey
2023-12-01 15:41 ` [PATCH 6/6] Implement DAP cancellation Tom Tromey
2023-12-01 15:57 ` Eli Zaretskii
2023-12-11 15:05 ` Tom Tromey
2023-12-11 15:44 ` Eli Zaretskii
2023-12-05 9:17 ` [PATCH 0/6] " Kévin Le Gouguec
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=20231201-dap-cancel-v1-5-872022fc328a@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).