mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-04-17 11:07:00 +02:00
14f99cfe53rpc: make `uptime` monotonic across NTP jumps (Lőrinc)a9440b1595util: add `TicksSeconds` (Lőrinc) Pull request description: ### Problem `bitcoin-cli uptime` was derived from wall-clock time, so it could jump by large amounts when the system clock is corrected after `bitcoind` starts (e.g. on RTC-less systems syncing NTP). This breaks the expectation that uptime reflects process runtime. ### Fix Compute uptime from a [monotonic clock](https://en.cppreference.com/w/cpp/chrono/steady_clock.html) so it is immune to wall-clock jumps, and use that monotonic uptime for the RPC. GUI startup time is derived from wall clock time minus monotonic uptime so it remains sensible after clock corrections. ### Reproducer Revert the fix commit and run the `rpc_uptime` functional test (it should fail with `AssertionError: uptime should not jump with wall clock`): Or alternatively: ```bash cmake -B build && cmake --build build --target bitcoind bitcoin-cli -j$(nproc) DATA_DIR=$(mktemp -d) ./build/bin/bitcoind -regtest -datadir="$DATA_DIR" -connect=0 -daemon ./build/bin/bitcoin-cli -regtest -datadir="$DATA_DIR" -rpcwait uptime sleep 1 ./build/bin/bitcoin-cli -regtest -datadir="$DATA_DIR" setmocktime $(( $(date +%s) + 20000000 )) ./build/bin/bitcoin-cli -regtest -datadir="$DATA_DIR" uptime ./build/bin/bitcoin-cli -regtest -datadir="$DATA_DIR" stop ``` <details> <summary>Before (uptime jumps with wall clock)</summary> ```bash Bitcoin Core starting 0 20000001 Bitcoin Core stopping ``` </details> <details> <summary>After (uptime stays monotonic)</summary> ```bash Bitcoin Core starting 0 1 Bitcoin Core stopping ``` </details> ---------- Issue: https://github.com/bitcoin/bitcoin/issues/34326 ACKs for top commit: maflcko: review ACK14f99cfe53🎦 willcl-ark: tACK14f99cfe53w0xlt: ACK14f99cfe53sedited: ACK14f99cfe53Tree-SHA512: 3909973f58666ffa0b784a6df087031b9e34d2022d354900a4dbb6cbe1d36285cd92770ee71350ebf64d6e8ab212d8ff0cd851f7dca1ec46ee2f19b417f53984
162 lines
5.7 KiB
C++
162 lines
5.7 KiB
C++
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
// Copyright (c) 2009-present The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#ifndef BITCOIN_UTIL_TIME_H
|
|
#define BITCOIN_UTIL_TIME_H
|
|
|
|
#include <chrono> // IWYU pragma: export
|
|
#include <cstdint>
|
|
#include <optional>
|
|
#include <string>
|
|
#include <string_view>
|
|
|
|
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 SteadyClock = std::chrono::steady_clock;
|
|
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>;
|
|
|
|
using SystemClock = std::chrono::system_clock;
|
|
|
|
/**
|
|
* Version of SteadyClock that is mockable in the context of tests (set the
|
|
* current value with SetMockTime), otherwise the system steady clock.
|
|
*/
|
|
struct MockableSteadyClock : public std::chrono::steady_clock {
|
|
using time_point = std::chrono::time_point<MockableSteadyClock>;
|
|
|
|
using mock_time_point = std::chrono::time_point<MockableSteadyClock, std::chrono::milliseconds>;
|
|
static constexpr mock_time_point::duration INITIAL_MOCK_TIME{1};
|
|
|
|
/** 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
|
|
|
|
/** Set mock time for testing.
|
|
* When mocking the steady clock, start at INITIAL_MOCK_TIME and add durations to elapse time as necessary
|
|
* for testing.
|
|
* To stop mocking, call ClearMockTime().
|
|
*/
|
|
static void SetMockTime(mock_time_point::duration mock_time_in);
|
|
|
|
/** Clear mock time, go back to system steady clock. */
|
|
static void ClearMockTime();
|
|
};
|
|
|
|
void UninterruptibleSleep(const std::chrono::microseconds& n);
|
|
|
|
/**
|
|
* Helper to count the seconds of a duration/time_point.
|
|
*
|
|
* All durations/time_points should be using std::chrono and calling this should generally
|
|
* be avoided in code. Though, it is still preferred to an inline t.count() to
|
|
* protect against a reliance on the exact type of t.
|
|
*
|
|
* 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 Dur1, typename Dur2>
|
|
constexpr auto Ticks(Dur2 d)
|
|
{
|
|
return std::chrono::duration_cast<Dur1>(d).count();
|
|
}
|
|
|
|
template <typename Duration>
|
|
constexpr int64_t TicksSeconds(Duration d)
|
|
{
|
|
return int64_t{Ticks<std::chrono::seconds>(d)};
|
|
}
|
|
template <typename Duration, typename Timepoint>
|
|
constexpr auto TicksSinceEpoch(Timepoint t)
|
|
{
|
|
return Ticks<Duration>(t.time_since_epoch());
|
|
}
|
|
constexpr int64_t count_seconds(std::chrono::seconds t) { return t.count(); }
|
|
constexpr int64_t count_milliseconds(std::chrono::milliseconds t) { return t.count(); }
|
|
constexpr int64_t count_microseconds(std::chrono::microseconds t) { return t.count(); }
|
|
|
|
using HoursDouble = std::chrono::duration<double, std::chrono::hours::period>;
|
|
using SecondsDouble = std::chrono::duration<double, std::chrono::seconds::period>;
|
|
using MillisecondsDouble = std::chrono::duration<double, std::chrono::milliseconds::period>;
|
|
|
|
/**
|
|
* DEPRECATED
|
|
* Use either ClockType::now() or Now<TimePointType>() if a cast is needed.
|
|
* ClockType is
|
|
* - SteadyClock/std::chrono::steady_clock for steady time
|
|
* - SystemClock/std::chrono::system_clock for system time
|
|
* - NodeClock for mockable system time
|
|
*/
|
|
int64_t GetTime();
|
|
|
|
/**
|
|
* DEPRECATED
|
|
* Use SetMockTime with chrono type
|
|
*
|
|
* @param[in] nMockTimeIn Time in seconds.
|
|
*/
|
|
void SetMockTime(int64_t nMockTimeIn);
|
|
|
|
/** For testing. Set e.g. with the setmocktime rpc, or -mocktime argument */
|
|
void SetMockTime(std::chrono::seconds mock_time_in);
|
|
void SetMockTime(std::chrono::time_point<NodeClock, std::chrono::seconds> mock);
|
|
|
|
/** For testing */
|
|
std::chrono::seconds GetMockTime();
|
|
|
|
/**
|
|
* Return the current time point cast to the given precision. Only use this
|
|
* when an exact precision is needed, otherwise use T::clock::now() directly.
|
|
*/
|
|
template <typename T>
|
|
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}
|
|
* helper functions if possible.
|
|
*/
|
|
std::string FormatISO8601DateTime(int64_t nTime);
|
|
std::string FormatISO8601Date(int64_t nTime);
|
|
std::optional<int64_t> ParseISO8601DateTime(std::string_view str);
|
|
|
|
/**
|
|
* RFC1123 formatting https://www.rfc-editor.org/rfc/rfc1123#section-5.2.14
|
|
* Used in HTTP/1.1 responses
|
|
*/
|
|
std::string FormatRFC1123DateTime(int64_t nTime);
|
|
|
|
/**
|
|
* Convert milliseconds to a struct timeval for e.g. select.
|
|
*/
|
|
struct timeval MillisToTimeval(int64_t nTimeout);
|
|
|
|
/**
|
|
* Convert milliseconds to a struct timeval for e.g. select.
|
|
*/
|
|
struct timeval MillisToTimeval(std::chrono::milliseconds ms);
|
|
|
|
#endif // BITCOIN_UTIL_TIME_H
|