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

Time fetches better.

Browse Source
This commit is contained in:
JoelKatz
2013-03-29 08:22:52 -07:00
parent 758ee2557d
commit 85afb49058
3 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,7 +98,7 @@ bool PeerSet::isActive()
LedgerAcquire::LedgerAcquire(const uint256& hash) : PeerSet(hash, LEDGER_ACQUIRE_TIMEOUT),
mHaveBase(false), mHaveState(false), mHaveTransactions(false), mAborted(false), mSignaled(false), mAccept(false),
mByHash(true)
mByHash(true), mWaitCount(0)
{
#ifdef LA_DEBUG
cLog(lsTRACE) << "Acquiring ledger " << mHash;
@@ -214,6 +214,18 @@ void LedgerAcquire::onTimer(bool progress)
}
}
void LedgerAcquire::awaitData()
{
boost::recursive_mutex::scoped_lock sl(mLock);
++mWaitCount;
}
void LedgerAcquire::noAwaitData()
{
boost::recursive_mutex::scoped_lock sl(mLock);
if (mWaitCount > 0 ) --mWaitCount;
}
void LedgerAcquire::addPeers()
{
std::vector<Peer::pointer> peerList = theApp->getConnectionPool().getPeerVector();
@@ -300,6 +312,13 @@ void LedgerAcquire::trigger(Peer::ref peer)
return;
}
if ((mWaitCount > 0) && peer)
{
mRecentPeers.push_back(peer->getPeerId());
cLog(lsTRACE) << "Deferring peer";
return;
}
if (sLog(lsTRACE))
{
if (peer)
@@ -484,6 +503,8 @@ void LedgerAcquire::trigger(Peer::ref peer)
}
}
mRecentPeers.clear();
if (mComplete || mFailed)
{
cLog(lsDEBUG) << "Done:" << (mComplete ? " complete" : "") << (mFailed ? " failed " : " ")
@@ -846,21 +867,23 @@ void LedgerAcquireMaster::dropLedger(const uint256& hash)
mLedgers.erase(hash);
}
void LedgerAcquireMaster::gotLedgerData(Job&, boost::shared_ptr<ripple::TMLedgerData> packet_ptr,
boost::weak_ptr<Peer> wPeer)
bool LedgerAcquireMaster::awaitLedgerData(const uint256& ledgerHash)
{
LedgerAcquire::pointer ledger = find(ledgerHash);
if (!ledger)
return false;
ledger->awaitData();
return true;
}
void LedgerAcquireMaster::gotLedgerData(Job&, uint256 hash,
boost::shared_ptr<ripple::TMLedgerData> packet_ptr, boost::weak_ptr<Peer> wPeer)
{
ripple::TMLedgerData& packet = *packet_ptr;
Peer::pointer peer = wPeer.lock();
if (!peer)
return;
uint256 hash;
if (packet.ledgerhash().size() != 32)
{
peer->punishPeer(LT_InvalidRequest);
return;
}
memcpy(hash.begin(), packet.ledgerhash().data(), 32);
cLog(lsTRACE) << "Got data (" << packet.nodes().size() << ") for acquiring ledger: " << hash;
LedgerAcquire::pointer ledger = find(hash);
@@ -870,6 +893,7 @@ void LedgerAcquireMaster::gotLedgerData(Job&, boost::shared_ptr<ripple::TMLedger
peer->punishPeer(LT_InvalidRequest);
return;
}
ledger->noAwaitData();
if (packet.type() == ripple::liBASE)
{