Addressing review feedback.

Author: ashgti

lldb/test/API/tools/lldb-dap/server/main.c

@@ -3,4 +3,4 @@
 int main(int argc, char const *argv[]) {
   printf("hello world!\n"); // breakpoint 1
   return 0;
-}
+}

lldb/tools/lldb-dap/DAP.cpp

@@ -8,7 +8,6 @@
 
 #include <chrono>
 #include <cstdarg>
-#include <fstream>
 #include <mutex>
 
 #include "DAP.h"
@@ -35,8 +34,8 @@ using namespace lldb_dap;
 
 namespace lldb_dap {
 
-DAP::DAP(llvm::StringRef path, std::shared_ptr<llvm::raw_ostream> log,
-         ReplMode repl_mode, std::vector<std::string> pre_init_commands)
+DAP::DAP(llvm::StringRef path, llvm::raw_ostream *log, ReplMode repl_mode,
+         std::vector<std::string> pre_init_commands)
     : debug_adaptor_path(path), broadcaster("lldb-dap"), log(log),
       exception_breakpoints(), pre_init_commands(pre_init_commands),
       focus_tid(LLDB_INVALID_THREAD_ID), stop_at_entry(false), is_attach(false),
@@ -220,19 +219,19 @@ std::string DAP::ReadJSON() {
   std::string json_str;
   int length;
 
-  if (!input.read_expected(log.get(), "Content-Length: "))
+  if (!input.read_expected(log, "Content-Length: "))
     return json_str;
 
-  if (!input.read_line(log.get(), length_str))
+  if (!input.read_line(log, length_str))
     return json_str;
 
   if (!llvm::to_integer(length_str, length))
     return json_str;
 
-  if (!input.read_expected(log.get(), "\r\n"))
+  if (!input.read_expected(log, "\r\n"))
     return json_str;
 
-  if (!input.read_full(log.get(), length, json_str))
+  if (!input.read_full(log, length, json_str))
     return json_str;
 
   if (log) {
@@ -685,9 +684,8 @@ PacketStatus DAP::GetNextObject(llvm::json::Object &object) {
     return PacketStatus::JSONMalformed;
   }
 
-  if (log) {
+  if (log)
     *log << llvm::formatv("{0:2}", *json_value).str() << "\n";
-  }
 
   llvm::json::Object *object_ptr = json_value->getAsObject();
   if (!object_ptr) {

lldb/tools/lldb-dap/DAP.h

@@ -32,7 +32,6 @@
 #include "llvm/Support/JSON.h"
 #include "llvm/Support/Threading.h"
 #include "llvm/Support/raw_ostream.h"
-#include <iosfwd>
 #include <map>
 #include <optional>
 #include <thread>
@@ -146,7 +145,7 @@ struct DAP {
   lldb::SBBroadcaster broadcaster;
   std::thread event_thread;
   std::thread progress_event_thread;
-  std::shared_ptr<llvm::raw_ostream> log;
+  llvm::raw_ostream *log;
   llvm::StringMap<SourceBreakpointMap> source_breakpoints;
   FunctionBreakpointMap function_breakpoints;
   InstructionBreakpointMap instruction_breakpoints;
@@ -198,8 +197,8 @@ struct DAP {
   // will contain that expression.
   std::string last_nonempty_var_expression;
 
-  DAP(llvm::StringRef path, std::shared_ptr<llvm::raw_ostream> log,
-      ReplMode repl_mode, std::vector<std::string> pre_init_commands);
+  DAP(llvm::StringRef path, llvm::raw_ostream *log, ReplMode repl_mode,
+      std::vector<std::string> pre_init_commands);
   ~DAP();
 
   DAP() = delete;

lldb/tools/lldb-dap/IOStream.cpp

@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "IOStream.h"
-#include <string>
 #include "llvm/Support/raw_ostream.h"
+#include <string>
 
 #if defined(_WIN32)
 #include <io.h>
@@ -18,7 +18,6 @@
 #include <unistd.h>
 #endif
 
-
 using namespace lldb_dap;
 
 StreamDescriptor::StreamDescriptor() = default;
@@ -144,7 +143,8 @@ bool InputStream::read_line(llvm::raw_ostream *log, std::string &line) {
   return true;
 }
 
-bool InputStream::read_expected(llvm::raw_ostream *log, llvm::StringRef expected) {
+bool InputStream::read_expected(llvm::raw_ostream *log,
+                                llvm::StringRef expected) {
   std::string result;
   if (!read_full(log, expected.size(), result))
     return false;

lldb/tools/lldb-dap/IOStream.h

@@ -23,7 +23,6 @@ typedef int SOCKET;
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
-#include <fstream>
 #include <string>
 
 // Windows requires different system calls for dealing with sockets and other

lldb/tools/lldb-dap/lldb-dap.cpp

@@ -4968,10 +4968,10 @@ int main(int argc, char *argv[]) {
   }
 
   const char *log_file_path = getenv("LLDBDAP_LOG");
-  std::shared_ptr<llvm::raw_ostream> log;
+  llvm::raw_ostream *log;
   if (log_file_path) {
     std::error_code EC;
-    log.reset(new llvm::raw_fd_ostream(log_file_path, EC));
+    log = new llvm::raw_fd_ostream(log_file_path, EC);
     if (EC) {
       llvm::errs() << "Could not open log file: " << EC.message() << ", "
                    << log_file_path << '\n';
@@ -5028,7 +5028,8 @@ int main(int argc, char *argv[]) {
 
     llvm::outs() << "Listening for: "
                  << llvm::join(*maybeListenerAddresses, ", ") << "\n";
-    // Ensure listening address are flushed for calles to retrieve the resolve address.
+    // Ensure listening address are flushed for calles to retrieve the resolve
+    // address.
     llvm::outs().flush();
 
     while (g_listener && g_listener->isListening()) {
@@ -5100,8 +5101,8 @@ int main(int argc, char *argv[]) {
 
   bool CleanExit = true;
   if (auto Err = dap.Loop()) {
-    if (dap.log)
-      *dap.log << "Transport Error: " << Err << "\n";
+    if (log)
+      *log << "Transport Error: " << Err << "\n";
     CleanExit = false;
   }