mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-08-24 09:41:27 +02:00
rpc: Use steady_clock for getrpcinfo durations
This commit is contained in:
@@ -11,14 +11,18 @@
|
||||
#include <util/strencodings.h>
|
||||
#include <util/string.h>
|
||||
#include <util/system.h>
|
||||
#include <util/time.h>
|
||||
|
||||
#include <boost/signals2/signal.hpp>
|
||||
|
||||
#include <cassert>
|
||||
#include <memory> // for unique_ptr
|
||||
#include <chrono>
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
#include <unordered_map>
|
||||
|
||||
using SteadyClock = std::chrono::steady_clock;
|
||||
|
||||
static GlobalMutex g_rpc_warmup_mutex;
|
||||
static std::atomic<bool> g_rpc_running{false};
|
||||
static bool fRPCInWarmup GUARDED_BY(g_rpc_warmup_mutex) = true;
|
||||
@@ -33,7 +37,7 @@ static bool ExecuteCommand(const CRPCCommand& command, const JSONRPCRequest& req
|
||||
struct RPCCommandExecutionInfo
|
||||
{
|
||||
std::string method;
|
||||
int64_t start;
|
||||
SteadyClock::time_point start;
|
||||
};
|
||||
|
||||
struct RPCServerInfo
|
||||
@@ -50,7 +54,7 @@ struct RPCCommandExecution
|
||||
explicit RPCCommandExecution(const std::string& method)
|
||||
{
|
||||
LOCK(g_rpc_server_info.mutex);
|
||||
it = g_rpc_server_info.active_commands.insert(g_rpc_server_info.active_commands.end(), {method, GetTimeMicros()});
|
||||
it = g_rpc_server_info.active_commands.insert(g_rpc_server_info.active_commands.end(), {method, SteadyClock::now()});
|
||||
}
|
||||
~RPCCommandExecution()
|
||||
{
|
||||
@@ -231,7 +235,7 @@ static RPCHelpMan getrpcinfo()
|
||||
for (const RPCCommandExecutionInfo& info : g_rpc_server_info.active_commands) {
|
||||
UniValue entry(UniValue::VOBJ);
|
||||
entry.pushKV("method", info.method);
|
||||
entry.pushKV("duration", GetTimeMicros() - info.start);
|
||||
entry.pushKV("duration", int64_t{Ticks<std::chrono::microseconds>(SteadyClock::now() - info.start)});
|
||||
active_commands.push_back(entry);
|
||||
}
|
||||
|
||||
|
@@ -40,10 +40,15 @@ 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 Dur1, typename Dur2>
|
||||
constexpr auto Ticks(Dur2 d)
|
||||
{
|
||||
return std::chrono::duration_cast<Dur1>(d).count();
|
||||
}
|
||||
template <typename Duration, typename Timepoint>
|
||||
constexpr auto TicksSinceEpoch(Timepoint t)
|
||||
{
|
||||
return std::chrono::time_point_cast<Duration>(t).time_since_epoch().count();
|
||||
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(); }
|
||||
|
Reference in New Issue
Block a user