[lldb-dap] Client expects initial threads request not empty

Author: kusmour

lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py

@@ -649,13 +649,17 @@ def request_configurationDone(self):
         response = self.send_recv(command_dict)
         if response:
             self.configuration_done_sent = True
+            # Client requests the baseline of currently existing threads after
+            # a successful launch or attach.
+            # Kick off the threads request that follows
+            self.request_threads()
         return response
 
     def _process_stopped(self):
         self.threads = None
         self.frame_scopes = {}
 
-    def request_continue(self, threadId=None):
+    def  request_continue(self, threadId=None):
         if self.exit_status is not None:
             raise ValueError("request_continue called after process exited")
         # If we have launched or attached, then the first continue is done by

lldb/tools/lldb-dap/DAP.h

@@ -207,6 +207,9 @@ struct DAP {
   /// The set of features supported by the connected client.
   llvm::DenseSet<ClientFeature> clientFeatures;
 
+  /// The initial thread list upon attaching
+  std::optional<llvm::json::Array> initial_thread_list;
+
   /// Creates a new DAP sessions.
   ///
   /// \param[in] log

lldb/tools/lldb-dap/Handler/ConfigurationDoneRequestHandler.cpp

@@ -44,6 +44,18 @@ namespace lldb_dap {
 //             just an acknowledgement, so no body field is required."
 //             }]
 // },
+
+llvm::json::Array CacheInitialThreads(DAP &dap) {
+  llvm::json::Array threads;
+  lldb::SBProcess process = dap.target.GetProcess();
+  const uint32_t num_threads = process.GetNumThreads();
+  for (uint32_t thread_idx = 0; thread_idx < num_threads; ++thread_idx) {
+    lldb::SBThread thread = process.GetThreadAtIndex(thread_idx);
+    threads.emplace_back(CreateThread(thread, dap.thread_format));
+  }
+  return threads;
+}
+
 void ConfigurationDoneRequestHandler::operator()(
     const llvm::json::Object &request) const {
   llvm::json::Object response;
@@ -52,8 +64,14 @@ void ConfigurationDoneRequestHandler::operator()(
   dap.configuration_done_sent = true;
   if (dap.stop_at_entry)
     SendThreadStoppedEvent(dap);
-  else
+  else {
+    // Client requests the baseline of currently existing threads after 
+    // a successful launch or attach.
+    // A 'threads' request will be sent after configurationDone response
+    // Obtain the list of threads before we resume the process
+    dap.initial_thread_list = CacheInitialThreads(dap);
     dap.target.GetProcess().Continue();
+  }
 }
 
 } // namespace lldb_dap

lldb/tools/lldb-dap/Handler/ThreadsRequestHandler.cpp

@@ -50,16 +50,26 @@ namespace lldb_dap {
 // }
 void ThreadsRequestHandler::operator()(
     const llvm::json::Object &request) const {
-  lldb::SBProcess process = dap.target.GetProcess();
   llvm::json::Object response;
   FillResponse(request, response);
 
-  const uint32_t num_threads = process.GetNumThreads();
   llvm::json::Array threads;
-  for (uint32_t thread_idx = 0; thread_idx < num_threads; ++thread_idx) {
-    lldb::SBThread thread = process.GetThreadAtIndex(thread_idx);
-    threads.emplace_back(CreateThread(thread, dap.thread_format));
+  // Client requests the baseline of currently existing threads after
+  // a successful launch or attach.
+  // A 'threads' request will be sent after configurationDone response.
+  // Return the cache of initial threads as process might have resumed
+  if (dap.initial_thread_list) {
+    threads = dap.initial_thread_list.value();
+    dap.initial_thread_list.reset();
+  } else {
+  lldb::SBProcess process = dap.target.GetProcess();
+    const uint32_t num_threads = process.GetNumThreads();
+    for (uint32_t thread_idx = 0; thread_idx < num_threads; ++thread_idx) {
+      lldb::SBThread thread = process.GetThreadAtIndex(thread_idx);
+      threads.emplace_back(CreateThread(thread, dap.thread_format));
+    }
   }
+
   if (threads.size() == 0) {
     response["success"] = llvm::json::Value(false);
   }