Merge pull request #6290
57092ed
rpc: make `gettxoutsettinfo` run lock-free (Wladimir J. van der Laan)
This commit is contained in:
commit
57539884f2
|
@ -345,8 +345,6 @@ UniValue gettxoutsetinfo(const UniValue& params, bool fHelp)
|
||||||
+ HelpExampleRpc("gettxoutsetinfo", "")
|
+ HelpExampleRpc("gettxoutsetinfo", "")
|
||||||
);
|
);
|
||||||
|
|
||||||
LOCK(cs_main);
|
|
||||||
|
|
||||||
UniValue ret(UniValue::VOBJ);
|
UniValue ret(UniValue::VOBJ);
|
||||||
|
|
||||||
CCoinsStats stats;
|
CCoinsStats stats;
|
||||||
|
|
|
@ -147,7 +147,10 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) const {
|
||||||
return error("%s: Deserialize or I/O error - %s", __func__, e.what());
|
return error("%s: Deserialize or I/O error - %s", __func__, e.what());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stats.nHeight = mapBlockIndex.find(GetBestBlock())->second->nHeight;
|
{
|
||||||
|
LOCK(cs_main);
|
||||||
|
stats.nHeight = mapBlockIndex.find(stats.hashBlock)->second->nHeight;
|
||||||
|
}
|
||||||
stats.hashSerialized = ss.GetHash();
|
stats.hashSerialized = ss.GetHash();
|
||||||
stats.nTotalAmount = nTotalAmount;
|
stats.nTotalAmount = nTotalAmount;
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in New Issue