From 5202e741b3d7c22e3a0e80a06bb90e58288c7778 Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Sat, 25 May 2024 22:41:50 -0400
Subject: [PATCH] Templatize log span on duration type.

---
 include/bitcoin/network/log/logger.hpp   | 10 ++++++++--
 include/bitcoin/network/log/reporter.hpp |  7 ++++++-
 src/log/logger.cpp                       |  6 ------
 src/log/reporter.cpp                     |  5 -----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/bitcoin/network/log/logger.hpp b/include/bitcoin/network/log/logger.hpp
index 8f91054a1..e63f9ab16 100644
--- a/include/bitcoin/network/log/logger.hpp
+++ b/include/bitcoin/network/log/logger.hpp
@@ -20,6 +20,7 @@
 #define LIBBITCOIN_NETWORK_LOG_LOGGER_HPP
 
 #include <atomic>
+#include <chrono>
 #include <ostream>
 #include <sstream>
 #include <utility>
@@ -103,8 +104,13 @@ class BCT_API logger final
     /// Fire event with optional value, recorded with current time.
     void fire(uint8_t event_, uint64_t value=zero) const NOEXCEPT;
 
-    /// Fire event with nanosecond duration value, recorded with current time.
-    void span(uint8_t event_, const time& started) const NOEXCEPT;
+    /// Fire event with value as duration start to now, in specified unints.
+    template <typename Time = milliseconds>
+    inline void span(uint8_t event_, const time& start) const NOEXCEPT
+    {
+        // value parameter is time span in Time units.
+        fire(event_, std::chrono::duration_cast<Time>(now() - start).count());
+    }
 
     /// If stopped, handler is invoked with error::subscriber_stopped/defaults
     /// and dropped. Otherwise it is held until stop/drop. False if failed.
diff --git a/include/bitcoin/network/log/reporter.hpp b/include/bitcoin/network/log/reporter.hpp
index bf24e499e..2a18f4d4a 100644
--- a/include/bitcoin/network/log/reporter.hpp
+++ b/include/bitcoin/network/log/reporter.hpp
@@ -34,7 +34,12 @@ class BCT_API reporter
 
 public:
     void fire(uint8_t event, size_t count=zero) const NOEXCEPT;
-    void span(uint8_t event, const logger::time& started) const NOEXCEPT;
+
+    template <typename Time = milliseconds>
+    void span(uint8_t event, const logger::time& started) const NOEXCEPT
+    {
+        log.span<Time>(event, started);
+    }
 
     // This is thread safe.
     const logger& log;
diff --git a/src/log/logger.cpp b/src/log/logger.cpp
index 829e7fdf9..b2600c068 100644
--- a/src/log/logger.cpp
+++ b/src/log/logger.cpp
@@ -143,12 +143,6 @@ void logger::do_subscribe_messages(const message_notifier& handler) NOEXCEPT
 // events
 // ----------------------------------------------------------------------------
 
-void logger::span(uint8_t event_, const time& started) const NOEXCEPT
-{
-    // value parameter is time span in nanoseconds.
-    fire(event_, (now() - started).count());
-}
-
 void logger::fire(uint8_t event_, uint64_t value) const NOEXCEPT
 {
     boost::asio::post(strand_,
diff --git a/src/log/reporter.cpp b/src/log/reporter.cpp
index 366d2906d..bd40c7bb2 100644
--- a/src/log/reporter.cpp
+++ b/src/log/reporter.cpp
@@ -34,10 +34,5 @@ void reporter::fire(uint8_t event, size_t count) const NOEXCEPT
     log.fire(event, count);
 }
 
-void reporter::span(uint8_t event, const logger::time& started) const NOEXCEPT
-{
-    log.span(event, started);
-}
-
 } // namespace network
 } // namespace libbitcoin