ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 02:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move shared_ptr releases to outside the lock in InboundLedgers::sweep

Browse Source
This commit is contained in:
Vinnie Falco
2013-08-22 15:09:42 -07:00
parent 35836c9896
commit 382b358bdf
2 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
modules/ripple_app/ledger/ripple_InboundLedgers.cpp
View File

@@ -221,23 +221,41 @@ void InboundLedgers::sweep ()
{
mRecentFailures.sweep ();
int now = UptimeTimer::getInstance ().getElapsedSeconds ();
boost::mutex::scoped_lock sl (mLock);
int const now = UptimeTimer::getInstance ().getElapsedSeconds ();
boost::unordered_map<uint256, InboundLedger::pointer>::iterator it = mLedgers.begin ();
while (it != mLedgers.end ())
// Make a list of things to sweep, while holding the lock
std::vector <MapType::mapped_type> stuffToSweep;
std::size_t total;
{
if (it->second->getLastAction () > now)
boost::mutex::scoped_lock sl (mLock);
MapType::iterator it (mLedgers.begin ());
total = mLedgers.size ();
stuffToSweep.reserve (total);
while (it != mLedgers.end ())
{
it->second->touch ();
++it;
if (it->second->getLastAction () > now)
{
it->second->touch ();
++it;
}
else if ((it->second->getLastAction () + 60) < now)
{
stuffToSweep.push_back (it->second);
// shouldn't cause the actual final delete
// since we are holding a reference in the vector.
it = mLedgers.erase (it);
}
else
{
++it;
}
}
else if ((it->second->getLastAction () + 60) < now)
it = mLedgers.erase (it);
else
++it;
}
WriteLog (lsDEBUG, InboundLedger) <<
"Sweeped " << stuffToSweep.size () <<
" out of " << total << " inbound ledgers.";
}
int InboundLedgers::getFetchCount (int& timeoutCount)

4
modules/ripple_app/ledger/ripple_InboundLedgers.h
View File

@@ -64,8 +64,10 @@ public:
void sweep ();
private:
typedef boost::unordered_map <uint256, InboundLedger::pointer> MapType;
boost::mutex mLock;
boost::unordered_map <uint256, InboundLedger::pointer> mLedgers;
MapType mLedgers;
KeyCache <uint256, UptimeTimerAdapter> mRecentFailures;
};