Merge 4b24f6bbb5 into merged_master (Bitcoin PR bitcoin/bitcoin#23302)

This commit is contained in:
Byron Hambly 2023-05-12 10:40:11 +00:00
commit 4d11268e6a
4 changed files with 19 additions and 26 deletions

View file

@ -2100,14 +2100,13 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state,
int64_t nTime5 = GetTimeMicros(); nTimeIndex += nTime5 - nTime4;
LogPrint(BCLog::BENCH, " - Index writing: %.2fms [%.2fs (%.2fms/blk)]\n", MILLI * (nTime5 - nTime4), nTimeIndex * MICRO, nTimeIndex * MILLI / nBlocksTotal);
TRACE7(validation, block_connected,
block.GetHash().ToString().c_str(),
TRACE6(validation, block_connected,
block.GetHash().data(),
pindex->nHeight,
block.vtx.size(),
nInputs,
nSigOpsCost,
GetTimeMicros() - nTimeStart, // in microseconds (µs)
block.GetHash().data()
GetTimeMicros() - nTimeStart // in microseconds (µs)
);
return true;