ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid lock overlap:

Browse Source 
Prefer to release the InboundLedgers lock before acquiring
a lock on a specific ledger
This commit is contained in:
JoelKatz
2015-06-21 22:12:06 -07:00
committed by Vinnie Falco
parent 924a8cdd4b
commit 7d96075e14
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ripple/app/ledger/impl/InboundLedgers.cpp
View File

@@ -58,6 +58,7 @@ public:
Ledger::pointer acquire (uint256 const& hash, std::uint32_t seq, InboundLedger::fcReason reason)
{
assert (hash.isNonZero ());
bool isNew = true;
InboundLedger::pointer inbound;
{
ScopedLockType sl (mLock);
@@ -67,12 +68,8 @@ public:
auto it = mLedgers.find (hash);
if (it != mLedgers.end ())
{
isNew = false;
inbound = it->second;
// If the acquisition failed, don't mark the item as
// recently accessed so that it can expire.
if (! inbound->isFailed ())
inbound->update (seq);
}
else
{
@@ -84,6 +81,9 @@ public:
}
}
}
if (inbound && ! isNew && ! inbound->isFailed ())
inbound->update (seq);
if (inbound && inbound->isComplete ())
return inbound->getLedger();
return {};