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

Cleanup trigger.

Browse Source
This commit is contained in:
JoelKatz
2013-01-04 20:26:26 -08:00
parent 217573599d
commit ee89904a00
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ void LedgerAcquire::onTimer(bool progress)
if (!getPeerCount()) if (!getPeerCount())
addPeers(); addPeers();
else else
trigger(Peer::pointer(), true); trigger(Peer::pointer());
} }
} }
@@ -202,7 +202,7 @@ void LedgerAcquire::addOnComplete(boost::function<void (LedgerAcquire::pointer)>
mLock.unlock(); mLock.unlock();
} }
void LedgerAcquire::trigger(Peer::ref peer, bool timer) void LedgerAcquire::trigger(Peer::ref peer)
{ {
if (mAborted || mComplete || mFailed) if (mAborted || mComplete || mFailed)
{ {
@@ -599,7 +599,7 @@ SMAddNode LedgerAcquireMaster::gotLedgerData(ripple::TMLedgerData& packet, Peer:
{ {
cLog(lsWARNING) << "Included TXbase invalid"; cLog(lsWARNING) << "Included TXbase invalid";
} }
ledger->trigger(peer, false); ledger->trigger(peer);
return san; return san;
} }
@@ -631,7 +631,7 @@ SMAddNode LedgerAcquireMaster::gotLedgerData(ripple::TMLedgerData& packet, Peer:
else else
ledger->takeAsNode(nodeIDs, nodeData, ret); ledger->takeAsNode(nodeIDs, nodeData, ret);
if (!ret.isInvalid()) if (!ret.isInvalid())
ledger->trigger(peer, false); ledger->trigger(peer);
return ret; return ret;
} }

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

@@ -80,7 +80,7 @@ protected:
void done(); void done();
void onTimer(bool progress); void onTimer(bool progress);
void newPeer(Peer::ref peer) { trigger(peer, false); } void newPeer(Peer::ref peer) { trigger(peer); }
boost::weak_ptr<PeerSet> pmDowncast(); boost::weak_ptr<PeerSet> pmDowncast();
@@ -105,7 +105,7 @@ public:
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,
SMAddNode&); SMAddNode&);
bool takeAsRootNode(const std::vector<unsigned char>& data, SMAddNode&); bool takeAsRootNode(const std::vector<unsigned char>& data, SMAddNode&);
void trigger(Peer::ref, bool timer); void trigger(Peer::ref);
bool tryLocal(); bool tryLocal();
void addPeers(); void addPeers();

6
src/cpp/ripple/LedgerConsensus.cpp
View File

@@ -69,7 +69,7 @@ void TransactionAcquire::onTimer(bool progress)
} }
} }
else if (!progress) else if (!progress)
trigger(Peer::pointer(), true); trigger(Peer::pointer());
} }
boost::weak_ptr<PeerSet> TransactionAcquire::pmDowncast() boost::weak_ptr<PeerSet> TransactionAcquire::pmDowncast()
@@ -77,7 +77,7 @@ boost::weak_ptr<PeerSet> TransactionAcquire::pmDowncast()
return boost::shared_polymorphic_downcast<PeerSet>(shared_from_this()); return boost::shared_polymorphic_downcast<PeerSet>(shared_from_this());
} }
void TransactionAcquire::trigger(Peer::ref peer, bool timer) void TransactionAcquire::trigger(Peer::ref peer)
{ {
if (mComplete || mFailed) if (mComplete || mFailed)
{ {
@@ -166,7 +166,7 @@ SMAddNode TransactionAcquire::takeNodes(const std::list<SHAMapNode>& nodeIDs,
++nodeIDit; ++nodeIDit;
++nodeDatait; ++nodeDatait;
} }
trigger(peer, false); trigger(peer);
progress(); progress();
return SMAddNode::useful(); return SMAddNode::useful();
} }

4
src/cpp/ripple/LedgerConsensus.h
View File

@@ -32,10 +32,10 @@ protected:
bool mHaveRoot; bool mHaveRoot;
void onTimer(bool progress); void onTimer(bool progress);
void newPeer(Peer::ref peer) { trigger(peer, false); } void newPeer(Peer::ref peer) { trigger(peer); }
void done(); void done();
void trigger(Peer::ref, bool timer); void trigger(Peer::ref);
boost::weak_ptr<PeerSet> pmDowncast(); boost::weak_ptr<PeerSet> pmDowncast();
public: public: