Deduping the emit functions, one now calls the other.

Author: ashgti

lldb/tools/lldb-dap/DAPLog.cpp

@@ -17,23 +17,18 @@ using namespace llvm;
 
 namespace lldb_dap {
 
-void Log::Emit(StringRef message) {
-  std::lock_guard<Log::Mutex> lock(m_mutex);
-  std::chrono::duration<double> now{
-      std::chrono::system_clock::now().time_since_epoch()};
-  m_stream << formatv("{0:f9} ", now.count()).str() << m_prefix << message
-           << "\n";
-  m_stream.flush();
-}
+void Log::Emit(StringRef message) { Emit(message, "", 0); }
 
-void Log::Emit(StringRef file, size_t line, StringRef message) {
+void Log::Emit(StringRef message, StringRef file, size_t line) {
   std::lock_guard<Log::Mutex> lock(m_mutex);
   std::chrono::duration<double> now{
       std::chrono::system_clock::now().time_since_epoch()};
-  m_stream << formatv("{0:f9} {1}:{2} ", now.count(), sys::path::filename(file),
-                      line)
-                  .str()
-           << m_prefix << message << "\n";
+  m_stream << formatv("{0:f9}", now.count()) << " ";
+  if (!file.empty())
+    m_stream << sys::path::filename(file) << ":" << line << " ";
+  if (!m_prefix.empty())
+    m_stream << m_prefix;
+  m_stream << message << "\n";
   m_stream.flush();
 }
 

lldb/tools/lldb-dap/DAPLog.h

@@ -20,7 +20,7 @@
 #define DAP_LOG(log, ...)                                                      \
   do {                                                                         \
     ::lldb_dap::Log &log_private = (log);                                      \
-    log_private.Emit(__FILE__, __LINE__, ::llvm::formatv(__VA_ARGS__).str());  \
+    log_private.Emit(::llvm::formatv(__VA_ARGS__).str(), __FILE__, __LINE__);  \
   } while (0)
 
 // Write message to log, if error is set. In the log message refer to the error
@@ -31,8 +31,8 @@
     ::llvm::Error error_private = (error);                                     \
     if (error_private)                                                         \
       log_private.Emit(                                                        \
-          __FILE__, __LINE__,                                                  \
-          ::lldb_dap::FormatError(::std::move(error_private), __VA_ARGS__));   \
+          ::lldb_dap::FormatError(::std::move(error_private), __VA_ARGS__),    \
+          __FILE__, __LINE__);                                                 \
   } while (0)
 
 namespace lldb_dap {
@@ -61,7 +61,7 @@ class Log final {
 
   /// Emit writes a message to the underlying stream, including the file and
   /// line the message originated from.
-  void Emit(llvm::StringRef file, size_t line, llvm::StringRef message);
+  void Emit(llvm::StringRef message, llvm::StringRef file, size_t line);
 
 private:
   std::string m_prefix;

lldb/unittests/DAP/DAPLogTest.cpp

@@ -38,12 +38,12 @@ TEST(DAPLog, Emit) {
   EXPECT_THAT(last_line(outs),
               MatchesRegex(TIMESTAMP_PATTERN "my_prefix: foobar\n"));
 
-  log.Emit("file.cpp", 42, "Hello from a file/line.");
+  log.Emit("Hello from a file/line.", "file.cpp", 42);
   EXPECT_THAT(
       last_line(outs),
       MatchesRegex(TIMESTAMP_PATTERN "file.cpp:42 Hello from a file/line.\n"));
 
-  inner_log.Emit("file.cpp", 42, "Hello from a file/line.");
+  inner_log.Emit("Hello from a file/line.", "file.cpp", 42);
   EXPECT_THAT(last_line(outs),
               MatchesRegex(TIMESTAMP_PATTERN
                            "file.cpp:42 my_prefix: Hello from a file/line.\n"));