Skip to content

Commit 44d7806

Browse files
committed
fix: use correct rpc interruption point in PeriodicStats
1 parent 07aa096 commit 44d7806

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/init.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -837,12 +837,15 @@ static void StartupNotify(const ArgsManager& args)
837837
}
838838
#endif
839839

840-
static void PeriodicStats(ArgsManager& args, ChainstateManager& chainman, const CTxMemPool& mempool)
840+
static void PeriodicStats(NodeContext& node)
841841
{
842842
assert(::g_stats_client->active());
843+
const ArgsManager& args = *Assert(node.args);
844+
ChainstateManager& chainman = *Assert(node.chainman);
845+
const CTxMemPool& mempool = *Assert(node.mempool);
843846
CCoinsStats stats{CoinStatsHashType::NONE};
844847
chainman.ActiveChainstate().ForceFlushStateToDisk();
845-
if (WITH_LOCK(cs_main, return GetUTXOStats(&chainman.ActiveChainstate().CoinsDB(), std::ref(chainman.m_blockman), stats, RpcInterruptionPoint, chainman.ActiveChain().Tip()))) {
848+
if (WITH_LOCK(cs_main, return GetUTXOStats(&chainman.ActiveChainstate().CoinsDB(), chainman.m_blockman, stats, node.rpc_interruption_point, chainman.ActiveChain().Tip()))) {
846849
::g_stats_client->gauge("utxoset.tx", stats.nTransactions, 1.0f);
847850
::g_stats_client->gauge("utxoset.txOutputs", stats.nTransactionOutputs, 1.0f);
848851
::g_stats_client->gauge("utxoset.dbSizeBytes", stats.nDiskSize, 1.0f);
@@ -2275,7 +2278,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
22752278

22762279
if (::g_stats_client->active()) {
22772280
int nStatsPeriod = std::min(std::max((int)args.GetArg("-statsperiod", DEFAULT_STATSD_PERIOD), MIN_STATSD_PERIOD), MAX_STATSD_PERIOD);
2278-
node.scheduler->scheduleEvery(std::bind(&PeriodicStats, std::ref(*node.args), std::ref(chainman), std::cref(*node.mempool)), std::chrono::seconds{nStatsPeriod});
2281+
node.scheduler->scheduleEvery(std::bind(&PeriodicStats, std::ref(node)), std::chrono::seconds{nStatsPeriod});
22792282
}
22802283

22812284
// ********************************************************* Step 11: import blocks

0 commit comments

Comments
 (0)