1 files changed, 5 insertions, 10 deletions
diff --git a/gdb/python/lib/gdb/dap/next.py b/gdb/python/lib/gdb/dap/next.py
index ddf4e05..898fff1 100644
--- a/gdb/python/lib/gdb/dap/next.py
+++ b/gdb/python/lib/gdb/dap/next.py
@@ -16,7 +16,7 @@
 import gdb
 
 from .events import exec_and_expect_stop
-from .server import capability, request, send_gdb, send_gdb_with_response
+from .server import capability, request
 from .startup import in_gdb_thread
 from .state import set_thread
 
@@ -73,19 +73,14 @@ def step_in(
     exec_and_expect_stop(cmd)
 
 
-@request("stepOut", defer_stop_events=True)
+@request("stepOut")
 def step_out(*, threadId: int, singleThread: bool = False, **args):
     _handle_thread_step(threadId, singleThread, True)
     exec_and_expect_stop("finish &", propagate_exception=True)
 
 
-# This is a server-side request because it is funny: it wants to
-# 'continue' but also return a result, which precludes using
-# response=False.  Using 'continue &' would mostly work ok, but this
-# yields races when a stop occurs before the response is sent back to
-# the client.
-@request("continue", on_dap_thread=True)
+@request("continue")
 def continue_request(*, threadId: int, singleThread: bool = False, **args):
-    locked = send_gdb_with_response(lambda: _handle_thread_step(threadId, singleThread))
-    send_gdb(lambda: exec_and_expect_stop("continue"))
+    locked = _handle_thread_step(threadId, singleThread)
+    exec_and_expect_stop("continue &")
     return {"allThreadsContinued": not locked}