Addressing feedback and reseting debugger interrupt requested sooner.

Author: ashgti

lldb/tools/lldb-dap/DAP.cpp

@@ -249,6 +249,9 @@ void DAP::Send(const Message &message) {
   // RequestHandler<> this should be handled in RequestHandler<>::operator().
   if (auto *resp = std::get_if<Response>(&message);
       resp && debugger.InterruptRequested()) {
+    // Clear the interrupt request.
+    debugger.CancelInterruptRequest();
+
     // If the debugger was interrupted, convert this response into a 'cancelled'
     // response because we might have a partial result.
     Response cancelled{/*request_seq=*/resp->request_seq,
@@ -699,7 +702,7 @@ bool DAP::HandleObject(const Message &M) {
       std::lock_guard<std::mutex> lock(m_active_request_mutex);
       m_active_request = req;
 
-      // Clear interrupt marker prior to handling the next request.
+      // Clear the interrupt request prior to invoking a handler.
       if (debugger.InterruptRequested())
         debugger.CancelInterruptRequest();
     }
@@ -814,7 +817,7 @@ llvm::Error DAP::Disconnect(bool terminateDebuggee) {
 
 bool DAP::IsCancelled(const protocol::Request &req) {
   std::lock_guard<std::mutex> lock(m_cancelled_requests_mutex);
-  return m_cancelled_requests.find(req.seq) != m_cancelled_requests.end();
+  return m_cancelled_requests.contains(req.seq);
 }
 
 void DAP::ClearCancelRequest(const CancelArguments &args) {

lldb/tools/lldb-dap/DAP.h

@@ -34,6 +34,7 @@
 #include "lldb/lldb-types.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseSet.h"
+#include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Error.h"
@@ -415,7 +416,7 @@ struct DAP {
   std::condition_variable m_queue_cv;
 
   std::mutex m_cancelled_requests_mutex;
-  std::set<int64_t> m_cancelled_requests;
+  llvm::SmallSet<int64_t, 4> m_cancelled_requests;
 
   std::mutex m_active_request_mutex;
   const protocol::Request *m_active_request;

lldb/tools/lldb-dap/Transport.h

@@ -31,7 +31,7 @@ class EndOfFileError : public llvm::ErrorInfo<EndOfFileError> {
   EndOfFileError() = default;
 
   void log(llvm::raw_ostream &OS) const override {
-    OS << "End of file reached.";
+    OS << "end of file reached";
   }
   std::error_code convertToErrorCode() const override {
     return llvm::inconvertibleErrorCode();
@@ -45,7 +45,7 @@ class TimeoutError : public llvm::ErrorInfo<TimeoutError> {
   TimeoutError() = default;
 
   void log(llvm::raw_ostream &OS) const override {
-    OS << "Operation timed out.";
+    OS << "operation timed out";
   }
   std::error_code convertToErrorCode() const override {
     return std::make_error_code(std::errc::timed_out);