try calm msvc; elevate time

Author: andiwand

src/odr/logger.cpp

@@ -1,7 +1,6 @@
 #include <odr/logger.hpp>
 
 #include <algorithm>
-#include <chrono>
 #include <filesystem>
 #include <iomanip>
 #include <iostream>
@@ -16,7 +15,7 @@ class NullLogger final : public Logger {
 public:
   [[nodiscard]] bool will_log(LogLevel) const final { return false; }
 
-  void log_impl(LogLevel, const std::string &,
+  void log_impl(Time, LogLevel, const std::string &,
                 const std::source_location &) final {
     // Do nothing
   }
@@ -43,9 +42,9 @@ class StdioLogger final : public Logger {
     return level >= m_level;
   }
 
-  void log_impl(LogLevel level, const std::string &message,
+  void log_impl(Time time, LogLevel level, const std::string &message,
                 const std::source_location &location) final {
-    print_head(*m_output, m_name, level, location, m_format);
+    print_head(*m_output, time, level, m_name, location, m_format);
     *m_output << message << "\n";
   }
 
@@ -75,13 +74,13 @@ class TeeLogger final : public Logger {
     });
   }
 
-  void log_impl(LogLevel level, const std::string &message,
+  void log_impl(Time time, LogLevel level, const std::string &message,
                 const std::source_location &location) final {
     for (const auto &logger : m_loggers) {
       if (!logger->will_log(level)) {
         continue;
       }
-      logger->log(level, message, location);
+      logger->log(level, message, time, location);
     }
   }
 
@@ -133,14 +132,13 @@ Logger::create_tee(const std::vector<std::shared_ptr<Logger>> &loggers) {
   return std::make_unique<TeeLogger>(loggers);
 }
 
-void Logger::print_head(std::ostream &out, const std::string &name,
-                        LogLevel level, const std::source_location &location,
+void Logger::print_head(std::ostream &out, Time time, LogLevel level,
+                        const std::string &name,
+                        const std::source_location &location,
                         const LogFormat &format) {
   if (!format.time_format.empty()) {
-    auto now = std::chrono::system_clock::now();
-    auto time = std::chrono::system_clock::to_time_t(now);
-    out << std::put_time(std::localtime(&time), format.time_format.c_str())
-        << " ";
+    auto t = Clock::to_time_t(time);
+    out << std::put_time(std::localtime(&t), format.time_format.c_str()) << " ";
   }
 
   if (format.level_width > 0) {

src/odr/logger.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <chrono>
 #include <memory>
 #include <source_location>
 #include <sstream>
@@ -26,6 +27,9 @@ struct LogFormat {
 
 class Logger {
 public:
+  using Clock = std::chrono::system_clock;
+  using Time = Clock::time_point;
+
   static Logger &null();
   static std::unique_ptr<Logger>
   create_stdio(const std::string &name, LogLevel level,
@@ -34,26 +38,27 @@ class Logger {
   static std::unique_ptr<Logger>
   create_tee(const std::vector<std::shared_ptr<Logger>> &loggers);
 
-  static void print_head(std::ostream &out, const std::string &name,
-                         LogLevel level, const std::source_location &location,
+  static void print_head(std::ostream &out, Time time, LogLevel level,
+                         const std::string &name,
+                         const std::source_location &location,
                          const LogFormat &format);
 
   virtual ~Logger() = default;
 
   [[nodiscard]] virtual bool will_log(LogLevel level) const = 0;
 
   inline void
-  log(LogLevel level, const std::string &message,
+  log(LogLevel level, const std::string &message, Time time = Clock::now(),
       const std::source_location &location = std::source_location::current()) {
     if (will_log(level)) {
-      log_impl(level, message, location);
+      log_impl(time, level, message, location);
     }
   }
 
   virtual void flush() = 0;
 
 protected:
-  virtual void log_impl(LogLevel level, const std::string &message,
+  virtual void log_impl(Time time, LogLevel level, const std::string &message,
                         const std::source_location &location) = 0;
 };
 

test/src/logger_test.cpp

@@ -4,7 +4,7 @@
 
 using namespace odr;
 
-TEST(Logger, stdout) {
+TEST(Logger, stdio) {
   auto logger = Logger::create_stdio("test", LogLevel::verbose);
 
   logger->log(LogLevel::verbose, "Test message with log function");