neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Cache heavy parts of CalcCbTxMerkleRoot* (#2885)

Browse Source
This commit is contained in:
UdjinM6 2019-04-30 16:19:41 +03:00 committed by GitHub
parent b3ed6410f4
commit 4dee7c4a25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/evo/cbtx.cpp
View File

@ -121,12 +121,25 @@ bool CalcCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindexPrev
int64_t nTime3 = GetTimeMicros(); nTimeSMNL += nTime3 - nTime2; int64_t nTime3 = GetTimeMicros(); nTimeSMNL += nTime3 - nTime2;
LogPrint("bench", " - CSimplifiedMNList: %.2fms [%.2fs]\n", 0.001 * (nTime3 - nTime2), nTimeSMNL * 0.000001); LogPrint("bench", " - CSimplifiedMNList: %.2fms [%.2fs]\n", 0.001 * (nTime3 - nTime2), nTimeSMNL * 0.000001);
static CSimplifiedMNList smlCached;
static uint256 merkleRootCached;
static bool mutatedCached{false};
if (sml.mnList == smlCached.mnList) {
merkleRootRet = merkleRootCached;
return !mutatedCached;
}
bool mutated = false; bool mutated = false;
merkleRootRet = sml.CalcMerkleRoot(&mutated); merkleRootRet = sml.CalcMerkleRoot(&mutated);
int64_t nTime4 = GetTimeMicros(); nTimeMerkle += nTime4 - nTime3; int64_t nTime4 = GetTimeMicros(); nTimeMerkle += nTime4 - nTime3;
LogPrint("bench", " - CalcMerkleRoot: %.2fms [%.2fs]\n", 0.001 * (nTime4 - nTime3), nTimeMerkle * 0.000001); LogPrint("bench", " - CalcMerkleRoot: %.2fms [%.2fs]\n", 0.001 * (nTime4 - nTime3), nTimeMerkle * 0.000001);
smlCached = std::move(sml);
merkleRootCached = merkleRootRet;
mutatedCached = mutated;
return !mutated; return !mutated;
} }
@ -139,6 +152,9 @@ bool CalcCbTxMerkleRootQuorums(const CBlock& block, const CBlockIndex* pindexPre
int64_t nTime1 = GetTimeMicros(); int64_t nTime1 = GetTimeMicros();
static std::map<Consensus::LLMQType, std::vector<const CBlockIndex*>> quorumsCached;
static std::map<Consensus::LLMQType, std::vector<uint256>> qcHashesCached;
auto quorums = llmq::quorumBlockProcessor->GetMinedAndActiveCommitmentsUntilBlock(pindexPrev); auto quorums = llmq::quorumBlockProcessor->GetMinedAndActiveCommitmentsUntilBlock(pindexPrev);
std::map<Consensus::LLMQType, std::vector<uint256>> qcHashes; std::map<Consensus::LLMQType, std::vector<uint256>> qcHashes;
size_t hashCount = 0; size_t hashCount = 0;
@ -146,17 +162,23 @@ bool CalcCbTxMerkleRootQuorums(const CBlock& block, const CBlockIndex* pindexPre
int64_t nTime2 = GetTimeMicros(); nTimeMinedAndActive += nTime2 - nTime1; int64_t nTime2 = GetTimeMicros(); nTimeMinedAndActive += nTime2 - nTime1;
LogPrint("bench", " - GetMinedAndActiveCommitmentsUntilBlock: %.2fms [%.2fs]\n", 0.001 * (nTime2 - nTime1), nTimeMinedAndActive * 0.000001); LogPrint("bench", " - GetMinedAndActiveCommitmentsUntilBlock: %.2fms [%.2fs]\n", 0.001 * (nTime2 - nTime1), nTimeMinedAndActive * 0.000001);
for (const auto& p : quorums) { if (quorums == quorumsCached) {
auto& v = qcHashes[p.first]; qcHashes = qcHashesCached;
v.reserve(p.second.size()); } else {
for (const auto& p2 : p.second) { for (const auto& p : quorums) {
llmq::CFinalCommitment qc; auto& v = qcHashes[p.first];
uint256 minedBlockHash; v.reserve(p.second.size());
bool found = llmq::quorumBlockProcessor->GetMinedCommitment(p.first, p2->GetBlockHash(), qc, minedBlockHash); for (const auto& p2 : p.second) {
assert(found); llmq::CFinalCommitment qc;
v.emplace_back(::SerializeHash(qc)); uint256 minedBlockHash;
hashCount++; bool found = llmq::quorumBlockProcessor->GetMinedCommitment(p.first, p2->GetBlockHash(), qc, minedBlockHash);
assert(found);
v.emplace_back(::SerializeHash(qc));
hashCount++;
}
} }
quorumsCached = quorums;
qcHashesCached = qcHashes;
} }
int64_t nTime3 = GetTimeMicros(); nTimeMined += nTime3 - nTime2; int64_t nTime3 = GetTimeMicros(); nTimeMined += nTime3 - nTime2;