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

Fix a few cases where we reset the acquire timer when we should not.

Browse Source
This commit is contained in:
JoelKatz
2012-08-07 04:11:20 -07:00
parent 86b9597ddd
commit b4e63c3025
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/LedgerAcquire.cpp
View File

@@ -102,7 +102,7 @@ void LedgerAcquire::onTimer()
setFailed(); setFailed();
done(); done();
} }
else trigger(Peer::pointer()); else trigger(Peer::pointer(), true);
} }
boost::weak_ptr<PeerSet> LedgerAcquire::pmDowncast() boost::weak_ptr<PeerSet> LedgerAcquire::pmDowncast()
@@ -140,7 +140,7 @@ void LedgerAcquire::addOnComplete(boost::function<void (LedgerAcquire::pointer)>
mLock.unlock(); mLock.unlock();
} }
void LedgerAcquire::trigger(Peer::pointer peer) void LedgerAcquire::trigger(Peer::pointer peer, bool timer)
{ {
if (mAborted || mComplete || mFailed) if (mAborted || mComplete || mFailed)
return; return;
@@ -159,10 +159,9 @@ void LedgerAcquire::trigger(Peer::pointer peer)
tmGL.set_itype(newcoin::liBASE); tmGL.set_itype(newcoin::liBASE);
*(tmGL.add_nodeids()) = SHAMapNode().getRawString(); *(tmGL.add_nodeids()) = SHAMapNode().getRawString();
sendRequest(tmGL, peer); sendRequest(tmGL, peer);
return; // Cannot go on without base
} }
if (!mHaveTransactions) if (mHaveBase && !mHaveTransactions)
{ {
#ifdef LA_DEBUG #ifdef LA_DEBUG
Log(lsTRACE) << "need tx"; Log(lsTRACE) << "need tx";
@@ -206,7 +205,7 @@ void LedgerAcquire::trigger(Peer::pointer peer)
} }
} }
if (!mHaveState) if (mHaveBase && !mHaveState)
{ {
#ifdef LA_DEBUG #ifdef LA_DEBUG
Log(lsTRACE) << "need as"; Log(lsTRACE) << "need as";
@@ -252,7 +251,7 @@ void LedgerAcquire::trigger(Peer::pointer peer)
if (mComplete || mFailed) if (mComplete || mFailed)
done(); done();
else else if (timer)
resetTimer(); resetTimer();
} }
@@ -460,7 +459,7 @@ bool LedgerAcquireMaster::gotLedgerData(newcoin::TMLedgerData& packet, Peer::poi
return false; return false;
if (packet.nodes_size() == 1) if (packet.nodes_size() == 1)
{ {
ledger->trigger(peer); ledger->trigger(peer, false);
return true; return true;
} }
if (!ledger->takeAsRootNode(strCopy(packet.nodes(1).nodedata()))) if (!ledger->takeAsRootNode(strCopy(packet.nodes(1).nodedata())))
@@ -469,12 +468,12 @@ bool LedgerAcquireMaster::gotLedgerData(newcoin::TMLedgerData& packet, Peer::poi
} }
if (packet.nodes().size() == 2) if (packet.nodes().size() == 2)
{ {
ledger->trigger(peer); ledger->trigger(peer, false);
return true; return true;
} }
if (!ledger->takeTxRootNode(strCopy(packet.nodes(2).nodedata()))) if (!ledger->takeTxRootNode(strCopy(packet.nodes(2).nodedata())))
Log(lsWARNING) << "Invcluded TXbase invalid"; Log(lsWARNING) << "Invcluded TXbase invalid";
ledger->trigger(peer); ledger->trigger(peer, false);
return true; return true;
} }
@@ -498,7 +497,7 @@ bool LedgerAcquireMaster::gotLedgerData(newcoin::TMLedgerData& packet, Peer::poi
else else
ret = ledger->takeAsNode(nodeIDs, nodeData); ret = ledger->takeAsNode(nodeIDs, nodeData);
if (ret) if (ret)
ledger->trigger(peer); ledger->trigger(peer, false);
return ret; return ret;
} }

4
src/LedgerAcquire.h
View File

@@ -72,7 +72,7 @@ protected:
void done(); void done();
void onTimer(); void onTimer();
void newPeer(Peer::pointer peer) { trigger(peer); } void newPeer(Peer::pointer peer) { trigger(peer, false); }
boost::weak_ptr<PeerSet> pmDowncast(); boost::weak_ptr<PeerSet> pmDowncast();
@@ -92,7 +92,7 @@ public:
bool takeTxRootNode(const std::vector<unsigned char>& data); bool takeTxRootNode(const std::vector<unsigned char>& data);
bool takeAsNode(const std::list<SHAMapNode>& IDs, const std::list<std::vector<unsigned char> >& data); bool takeAsNode(const std::list<SHAMapNode>& IDs, const std::list<std::vector<unsigned char> >& data);
bool takeAsRootNode(const std::vector<unsigned char>& data); bool takeAsRootNode(const std::vector<unsigned char>& data);
void trigger(Peer::pointer); void trigger(Peer::pointer, bool timer);
}; };
class LedgerAcquireMaster class LedgerAcquireMaster

6
src/LedgerConsensus.cpp
View File

@@ -36,7 +36,7 @@ boost::weak_ptr<PeerSet> TransactionAcquire::pmDowncast()
return boost::shared_polymorphic_downcast<PeerSet, TransactionAcquire>(shared_from_this()); return boost::shared_polymorphic_downcast<PeerSet, TransactionAcquire>(shared_from_this());
} }
void TransactionAcquire::trigger(Peer::pointer peer) void TransactionAcquire::trigger(Peer::pointer peer, bool timer)
{ {
if (mComplete || mFailed) if (mComplete || mFailed)
return; return;
@@ -76,7 +76,7 @@ void TransactionAcquire::trigger(Peer::pointer peer)
} }
if (mComplete || mFailed) if (mComplete || mFailed)
done(); done();
else else if (timer)
resetTimer(); resetTimer();
} }
@@ -110,7 +110,7 @@ bool TransactionAcquire::takeNodes(const std::list<SHAMapNode>& nodeIDs,
++nodeIDit; ++nodeIDit;
++nodeDatait; ++nodeDatait;
} }
trigger(peer); trigger(peer, false);
progress(); progress();
return true; return true;
} }

6
src/LedgerConsensus.h
View File

@@ -27,11 +27,11 @@ protected:
SHAMap::pointer mMap; SHAMap::pointer mMap;
bool mHaveRoot; bool mHaveRoot;
void onTimer() { trigger(Peer::pointer()); } void onTimer() { trigger(Peer::pointer(), true); }
void newPeer(Peer::pointer peer) { trigger(peer); } void newPeer(Peer::pointer peer) { trigger(peer, false); }
void done(); void done();
void trigger(Peer::pointer); void trigger(Peer::pointer, bool timer);
boost::weak_ptr<PeerSet> pmDowncast(); boost::weak_ptr<PeerSet> pmDowncast();
public: public: