From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 12/25] Add singleThread support to some DAP requests
Date: Wed, 24 May 2023 10:37:03 -0600 [thread overview]
Message-ID: <20230427-ada-catch-exception-v1-12-947caa9905e3@adacore.com> (raw)
In-Reply-To: <20230427-ada-catch-exception-v1-0-947caa9905e3@adacore.com>
A few DAP requests support a "singleThread" parameter, which is
somewhat similar to scheduler-locking. This patch implements support
for this.
---
gdb/python/lib/gdb/dap/next.py | 45 ++++++++++++++++++++++---------
gdb/testsuite/gdb.dap/basic-dap.exp | 9 ++++---
gdb/testsuite/gdb.dap/catch-exception.exp | 3 ++-
3 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/gdb/python/lib/gdb/dap/next.py b/gdb/python/lib/gdb/dap/next.py
index 232b1529fe5..290b9b855ba 100644
--- a/gdb/python/lib/gdb/dap/next.py
+++ b/gdb/python/lib/gdb/dap/next.py
@@ -13,21 +13,40 @@
# 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
+
from .events import StopKinds, ExecutionInvoker
from .server import capability, request
-from .startup import send_gdb
+from .startup import in_gdb_thread, send_gdb, send_gdb_with_response
from .state import set_thread
-# Helper function to set the current thread.
-def _handle_thread_step(threadId):
+# Helper function to set the current thread and the scheduler-locking
+# mode. Returns True if scheduler-locking was successfully set to
+# 'on', False in all other cases, including error.
+@in_gdb_thread
+def _handle_thread_step(thread_id, single_thread):
# Ensure we're going to step the correct thread.
- send_gdb(lambda: set_thread(threadId))
+ set_thread(thread_id)
+ if single_thread:
+ result = True
+ arg = "on"
+ else:
+ result = False
+ arg = "off"
+ try:
+ # This can fail, depending on the target, so catch the error
+ # and report to our caller. We can't use exec_and_log because
+ # that does not propagate exceptions.
+ gdb.execute("set scheduler-locking " + arg, from_tty=True, to_string=True)
+ except gdb.error:
+ result = False
+ return result
@request("next")
-def next(*, threadId, granularity="statement", **args):
- _handle_thread_step(threadId)
+def next(*, threadId, singleThread=False, granularity="statement", **args):
+ send_gdb(lambda: _handle_thread_step(threadId, singleThread))
cmd = "next"
if granularity == "instruction":
cmd += "i"
@@ -35,9 +54,10 @@ def next(*, threadId, granularity="statement", **args):
@capability("supportsSteppingGranularity")
+@capability("supportsSingleThreadExecutionRequests")
@request("stepIn")
-def stepIn(*, threadId, granularity="statement", **args):
- _handle_thread_step(threadId)
+def stepIn(*, threadId, singleThread=False, granularity="statement", **args):
+ send_gdb(lambda: _handle_thread_step(threadId, singleThread))
cmd = "step"
if granularity == "instruction":
cmd += "i"
@@ -45,12 +65,13 @@ def stepIn(*, threadId, granularity="statement", **args):
@request("stepOut")
-def step_out(*, threadId):
- _handle_thread_step(threadId)
+def step_out(*, threadId, singleThread=False):
+ send_gdb(lambda: _handle_thread_step(threadId, singleThread))
send_gdb(ExecutionInvoker("finish", StopKinds.STEP))
@request("continue")
-def continue_request(**args):
+def continue_request(*, threadId, singleThread=False, **args):
+ locked = send_gdb_with_response(lambda: _handle_thread_step(threadId, singleThread))
send_gdb(ExecutionInvoker("continue", None))
- return {"allThreadsContinued": True}
+ return {"allThreadsContinued": not locked}
diff --git a/gdb/testsuite/gdb.dap/basic-dap.exp b/gdb/testsuite/gdb.dap/basic-dap.exp
index d4dbdac70ff..ce739875404 100644
--- a/gdb/testsuite/gdb.dap/basic-dap.exp
+++ b/gdb/testsuite/gdb.dap/basic-dap.exp
@@ -136,15 +136,18 @@ set obj [dap_check_request_and_response "evaluate global second time" \
dap_match_values "global value after step" [lindex $obj 0] \
"body result" 24
-dap_check_request_and_response "continue to address" continue
+dap_check_request_and_response "continue to address" continue \
+ {o threadId [i 1]}
dap_wait_for_event_and_check "stopped at address breakpoint" stopped \
"body reason" breakpoint \
"body hitBreakpointIds" $insn_bpno
-dap_check_request_and_response "continue to line" continue
+dap_check_request_and_response "continue to line" continue \
+ {o threadId [i 1]}
dap_wait_for_event_and_check "stopped at line breakpoint" stopped \
"body reason" breakpoint \
- "body hitBreakpointIds" $line_bpno
+ "body hitBreakpointIds" $line_bpno \
+ "body allThreadsStopped" true
dap_check_request_and_response "return from function" stepOut \
{o threadId [i 1]}
diff --git a/gdb/testsuite/gdb.dap/catch-exception.exp b/gdb/testsuite/gdb.dap/catch-exception.exp
index 6bfeb3ed87e..7f2e750b32e 100644
--- a/gdb/testsuite/gdb.dap/catch-exception.exp
+++ b/gdb/testsuite/gdb.dap/catch-exception.exp
@@ -57,7 +57,8 @@ dap_wait_for_event_and_check "stopped at first raise" stopped \
"body reason" breakpoint \
"body hitBreakpointIds" 2
-dap_check_request_and_response "continue to assert" continue
+dap_check_request_and_response "continue to assert" continue \
+ {o threadId [i 1]}
dap_wait_for_event_and_check "stopped at assert" stopped \
"body reason" breakpoint \
"body hitBreakpointIds" 1
--
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 ` Tom Tromey [this message]
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 ` [PATCH 21/25] Add "target" parameter to DAP attach request Tom Tromey
2023-05-24 16:55 ` 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-12-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).