diff options
author | MarcoFalke <falke.marco@gmail.com> | 2022-04-08 17:37:18 +0200 |
---|---|---|
committer | MacroFake <falke.marco@gmail.com> | 2022-05-18 18:58:05 +0200 |
commit | fa305fd92c0a5a91831be3ccec0a5ef962a5fbcb (patch) | |
tree | e718750f28eeb8a8775ce228059d561a03bd84f4 /src/util/time.h | |
parent | 002411dc53753b52fef645484258e8baf41585a1 (diff) | |
download | bitcoin-fa305fd92c0a5a91831be3ccec0a5ef962a5fbcb.tar.xz |
Add mockable clock type and TicksSinceEpoch helper
Diffstat (limited to 'src/util/time.h')
-rw-r--r-- | src/util/time.h | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/src/util/time.h b/src/util/time.h index 72956ea0d7..14df3fe53a 100644 --- a/src/util/time.h +++ b/src/util/time.h @@ -14,6 +14,16 @@ using namespace std::chrono_literals; +/** Mockable clock in the context of tests, otherwise the system clock */ +struct NodeClock : public std::chrono::system_clock { + using time_point = std::chrono::time_point<NodeClock>; + /** Return current system time or mocked time, if set */ + static time_point now() noexcept; + static std::time_t to_time_t(const time_point&) = delete; // unused + static time_point from_time_t(std::time_t) = delete; // unused +}; +using NodeSeconds = std::chrono::time_point<NodeClock, std::chrono::seconds>; + using SteadySeconds = std::chrono::time_point<std::chrono::steady_clock, std::chrono::seconds>; using SteadyMilliseconds = std::chrono::time_point<std::chrono::steady_clock, std::chrono::milliseconds>; using SteadyMicroseconds = std::chrono::time_point<std::chrono::steady_clock, std::chrono::microseconds>; @@ -30,10 +40,10 @@ void UninterruptibleSleep(const std::chrono::microseconds& n); * This helper is used to convert durations/time_points before passing them over an * interface that doesn't support std::chrono (e.g. RPC, debug log, or the GUI) */ -template <typename Clock> -constexpr int64_t count_seconds(std::chrono::time_point<Clock, std::chrono::seconds> t) +template <typename Duration, typename Timepoint> +constexpr auto TicksSinceEpoch(Timepoint t) { - return t.time_since_epoch().count(); + return std::chrono::time_point_cast<Duration>(t).time_since_epoch().count(); } constexpr int64_t count_seconds(std::chrono::seconds t) { return t.count(); } constexpr int64_t count_milliseconds(std::chrono::milliseconds t) { return t.count(); } @@ -48,7 +58,11 @@ inline double CountSecondsDouble(SecondsDouble t) { return t.count(); } /** * DEPRECATED - * Use either GetTimeSeconds (not mockable) or GetTime<T> (mockable) + * Use either ClockType::now() or Now<TimePointType>() if a cast is needed. + * ClockType is + * - std::chrono::steady_clock for steady time + * - std::chrono::system_clock for system time + * - NodeClock for mockable system time */ int64_t GetTime(); @@ -71,9 +85,6 @@ void SetMockTime(std::chrono::seconds mock_time_in); /** For testing */ std::chrono::seconds GetMockTime(); -/** Return system time (or mocked time, if set) */ -template <typename T> -T GetTime(); /** * Return the current time point cast to the given precicion. Only use this * when an exact precicion is needed, otherwise use T::clock::now() directly. @@ -83,6 +94,12 @@ T Now() { return std::chrono::time_point_cast<typename T::duration>(T::clock::now()); } +/** DEPRECATED, see GetTime */ +template <typename T> +T GetTime() +{ + return Now<std::chrono::time_point<NodeClock, T>>().time_since_epoch(); +} /** * ISO 8601 formatting is preferred. Use the FormatISO8601{DateTime,Date} |