ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Be smarter about when we clean up ledger acquires.

Browse Source
This commit is contained in:
JoelKatz
2013-01-07 14:42:46 -08:00
parent ba79026185
commit ecc04b21f3
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/cpp/ripple/LedgerAcquire.cpp
View File

@@ -20,6 +20,7 @@ DECLARE_INSTANCE(LedgerAcquire);
PeerSet::PeerSet(const uint256& hash, int interval) : mHash(hash), mTimerInterval(interval), mTimeouts(0),
mComplete(false), mFailed(false), mProgress(true), mTimer(theApp->getIOService())
{
mLastAction = time(NULL);
assert((mTimerInterval > 10) && (mTimerInterval < 30000));
}
@@ -170,6 +171,7 @@ void LedgerAcquire::done()
if (mSignaled)
return;
mSignaled = true;
touch();
#ifdef LA_DEBUG
cLog(lsTRACE) << "Done acquiring ledger " << mHash;
#endif
@@ -559,7 +561,10 @@ LedgerAcquire::pointer LedgerAcquireMaster::findCreate(const uint256& hash)
boost::mutex::scoped_lock sl(mLock);
LedgerAcquire::pointer& ptr = mLedgers[hash];
if (ptr)
{
ptr->touch();
return ptr;
}
ptr = boost::make_shared<LedgerAcquire>(hash);
ptr->addPeers();
ptr->setTimer(); // Cannot call in constructor
@@ -572,7 +577,10 @@ LedgerAcquire::pointer LedgerAcquireMaster::find(const uint256& hash)
boost::mutex::scoped_lock sl(mLock);
std::map<uint256, LedgerAcquire::pointer>::iterator it = mLedgers.find(hash);
if (it != mLedgers.end())
{
it->second->touch();
return it->second;
}
return LedgerAcquire::pointer();
}
@@ -726,12 +734,15 @@ bool LedgerAcquireMaster::isFailure(const uint256& hash)
void LedgerAcquireMaster::sweep()
{
time_t now = time(NULL);
boost::mutex::scoped_lock sl(mLock);
std::map<uint256, LedgerAcquire::pointer>::iterator it = mLedgers.begin();
while (it != mLedgers.end())
{
if (it->second->isDone())
if (it->second->getLastAction() > now)
it->second->touch();
else if ((it->second->getLastAction() + 500) < now)
mLedgers.erase(it++);
else
++it;

3
src/cpp/ripple/LedgerAcquire.h
View File

@@ -26,6 +26,7 @@ protected:
uint256 mHash;
int mTimerInterval, mTimeouts;
bool mComplete, mFailed, mProgress;
time_t mLastAction;
boost::recursive_mutex mLock;
boost::asio::deadline_timer mTimer;
@@ -45,6 +46,8 @@ public:
void progress() { mProgress = true; }
bool isProgress() { return mProgress; }
void touch() { mLastAction = time(NULL); }
time_t getLastAction() { return mLastAction; }
void peerHas(Peer::ref);
void badPeer(Peer::ref);