|
|
@ -2059,7 +2059,6 @@ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock * |
|
|
|
LogPrint("bench", " - Load block from disk: %.2fms [%.2fs]\n", (nTime2 - nTime1) * 0.001, nTimeReadFromDisk * 0.000001); |
|
|
|
LogPrint("bench", " - Load block from disk: %.2fms [%.2fs]\n", (nTime2 - nTime1) * 0.001, nTimeReadFromDisk * 0.000001); |
|
|
|
{ |
|
|
|
{ |
|
|
|
CCoinsViewCache view(pcoinsTip); |
|
|
|
CCoinsViewCache view(pcoinsTip); |
|
|
|
CInv inv(MSG_BLOCK, pindexNew->GetBlockHash()); |
|
|
|
|
|
|
|
bool rv = ConnectBlock(*pblock, state, pindexNew, view); |
|
|
|
bool rv = ConnectBlock(*pblock, state, pindexNew, view); |
|
|
|
GetMainSignals().BlockChecked(*pblock, state); |
|
|
|
GetMainSignals().BlockChecked(*pblock, state); |
|
|
|
if (!rv) { |
|
|
|
if (!rv) { |
|
|
@ -2067,7 +2066,7 @@ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock * |
|
|
|
InvalidBlockFound(pindexNew, state); |
|
|
|
InvalidBlockFound(pindexNew, state); |
|
|
|
return error("ConnectTip(): ConnectBlock %s failed", pindexNew->GetBlockHash().ToString()); |
|
|
|
return error("ConnectTip(): ConnectBlock %s failed", pindexNew->GetBlockHash().ToString()); |
|
|
|
} |
|
|
|
} |
|
|
|
mapBlockSource.erase(inv.hash); |
|
|
|
mapBlockSource.erase(pindexNew->GetBlockHash()); |
|
|
|
nTime3 = GetTimeMicros(); nTimeConnectTotal += nTime3 - nTime2; |
|
|
|
nTime3 = GetTimeMicros(); nTimeConnectTotal += nTime3 - nTime2; |
|
|
|
LogPrint("bench", " - Connect total: %.2fms [%.2fs]\n", (nTime3 - nTime2) * 0.001, nTimeConnectTotal * 0.000001); |
|
|
|
LogPrint("bench", " - Connect total: %.2fms [%.2fs]\n", (nTime3 - nTime2) * 0.001, nTimeConnectTotal * 0.000001); |
|
|
|
assert(view.Flush()); |
|
|
|
assert(view.Flush()); |
|
|
|