mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpc: reduce LOCK(cs_main) scope in GetUndoChecked and getblockstats

Browse Source
This commit is contained in:
Andrew Toth committed 2022-12-06 15:07:04 -05:00
1 parent efd82aec8a
commit 4d92b5aaba
1 file changed
+6 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/blockchain.cpp
+6 -5
View File
@@ -600,16 +600,18 @@ static CBlock GetBlockChecked(BlockManager& blockman, const CBlockIndex* pblocki
return block; return block;
} }
static CBlockUndo GetUndoChecked(BlockManager& blockman, const CBlockIndex* pblockindex) EXCLUSIVE_LOCKS_REQUIRED(cs_main) static CBlockUndo GetUndoChecked(BlockManager& blockman, const CBlockIndex* pblockindex)
{ {
AssertLockHeld(::cs_main);
CBlockUndo blockUndo; CBlockUndo blockUndo;
// The Genesis block does not have undo data // The Genesis block does not have undo data
if (pblockindex->nHeight == 0) return blockUndo; if (pblockindex->nHeight == 0) return blockUndo;
if (blockman.IsBlockPruned(pblockindex)) { {
throw JSONRPCError(RPC_MISC_ERROR, "Undo data not available (pruned data)"); LOCK(cs_main);
if (blockman.IsBlockPruned(pblockindex)) {
throw JSONRPCError(RPC_MISC_ERROR, "Undo data not available (pruned data)");
}
} }
if (!UndoReadFromDisk(blockUndo, pblockindex)) { if (!UndoReadFromDisk(blockUndo, pblockindex)) {
@@ -1799,7 +1801,6 @@ static RPCHelpMan getblockstats()
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
{ {
ChainstateManager& chainman = EnsureAnyChainman(request.context); ChainstateManager& chainman = EnsureAnyChainman(request.context);
LOCK(cs_main);
const CBlockIndex& pindex{*CHECK_NONFATAL(ParseHashOrHeight(request.params[0], chainman))}; const CBlockIndex& pindex{*CHECK_NONFATAL(ParseHashOrHeight(request.params[0], chainman))};
std::set<std::string> stats; std::set<std::string> stats;