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

Merge branch 'develop' into feature-keyvadb

Browse Source 
Conflicts:
	src/cpp/ripple/ripple_TransactionAcquire.cpp
This commit is contained in:
JoelKatz
2013-07-22 13:32:10 -07:00
parent 64d45918eb 9cb06ba936
commit 69c16c19d6
15 changed files with 82 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/ripple_app/ledger/LedgerMaster.cpp
View File

@@ -503,10 +503,7 @@ void LedgerMaster::resumeAcquiring ()
if (nextLedger)
acquireMissingLedger (nextLedger, nextLedger->getParentHash (), nextLedger->getLedgerSeq () - 1);
else
{
mCompleteLedgers.clearValue (prevMissing);
WriteLog (lsINFO, LedgerMaster) << "We have a gap at: " << prevMissing + 1;
}
}
}

6
modules/ripple_app/ledger/ripple_InboundLedger.cpp
View File

@@ -13,7 +13,7 @@ SETUP_LOG (InboundLedger)
#define LEDGER_TIMEOUT_AGGRESSIVE 6 // how many timeouts before we get aggressive
InboundLedger::InboundLedger (uint256 const& hash, uint32 seq)
: PeerSet (hash, LEDGER_ACQUIRE_TIMEOUT)
: PeerSet (hash, LEDGER_ACQUIRE_TIMEOUT, false)
, mHaveBase (false)
, mHaveState (false)
, mHaveTransactions (false)
@@ -138,7 +138,7 @@ bool InboundLedger::tryLocal ()
return mComplete;
}
void InboundLedger::onTimer (bool progress)
void InboundLedger::onTimer (bool progress, boost::recursive_mutex::scoped_lock&)
{
mRecentTXNodes.clear ();
mRecentASNodes.clear ();
@@ -844,7 +844,7 @@ std::vector<InboundLedger::neededHash_t> InboundLedger::getNeededHashes ()
if (!mHaveTransactions)
{
TransactionStateSF filter (mLedger->getLedgerSeq ());
std::vector<uint256> v = mLedger->getNeededAccountStateHashes (4, &filter);
std::vector<uint256> v = mLedger->getNeededTransactionHashes (4, &filter);
BOOST_FOREACH (uint256 const & h, v)
{
ret.push_back (std::make_pair (protocol::TMGetObjectByHash::otTRANSACTION_NODE, h));

2
modules/ripple_app/ledger/ripple_InboundLedger.h
View File

@@ -92,7 +92,7 @@ public:
private:
void done ();
void onTimer (bool progress);
void onTimer (bool progress, boost::recursive_mutex::scoped_lock& peerSetLock);
void newPeer (Peer::ref peer)
{

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

@@ -23,7 +23,7 @@ InboundLedger::pointer InboundLedgers::findCreate (uint256 const& hash, uint32 s
ptr->addPeers ();
ptr->setTimer (); // Cannot call in constructor
}
else
else if (ptr->isComplete ())
{
Ledger::pointer ledger = ptr->getLedger ();
ledger->setClosed ();