Bug fixes and performance improvements.

src/cpp/ripple/LedgerAcquire.cpp

@@ -74,6 +74,12 @@ void PeerSet::TimerEntry(boost::weak_ptr<PeerSet> wptr, const boost::system::err
 		ptr->invokeOnTimer();
 }
 
+bool PeerSet::isActive()
+{
+	boost::recursive_mutex::scoped_lock sl(mLock);
+	return !isDone();
+}
+
 LedgerAcquire::LedgerAcquire(const uint256& hash) : PeerSet(hash, LEDGER_ACQUIRE_TIMEOUT),
 	mHaveBase(false), mHaveState(false), mHaveTransactions(false), mAborted(false), mSignaled(false), mAccept(false),
 	mByHash(true)
@@ -106,6 +112,9 @@ bool LedgerAcquire::tryLocal()
 		try
 		{
 			mLedger->peekTransactionMap()->fetchRoot(mLedger->getTransHash());
+			std::vector<uint256> h = mLedger->peekTransactionMap()->getNeededHashes(1);
+			if (h.empty())
+				mHaveTransactions = true;
 		}
 		catch (SHAMapMissingNode&)
 		{
@@ -119,13 +128,19 @@ bool LedgerAcquire::tryLocal()
 		try
 		{
 			mLedger->peekAccountStateMap()->fetchRoot(mLedger->getAccountHash());
+			std::vector<uint256> h = mLedger->peekAccountStateMap()->getNeededHashes(1);
+			if (h.empty())
+				mHaveState = true;
 		}
 		catch (SHAMapMissingNode&)
 		{
 		}
 	}
 
-	return mHaveTransactions && mHaveState;
+	if (mHaveTransactions && mHaveState)
+		mComplete = true;
+
+	return mComplete;
 }
 
 void LedgerAcquire::onTimer(bool progress)
@@ -192,10 +207,11 @@ void LedgerAcquire::done()
 
 	assert(isComplete() || isFailed());
 
-	mLock.lock();
+	{
-	triggers = mOnComplete;
+		boost::recursive_mutex::scoped_lock sl(mLock);
+		triggers = mOnComplete;
+	}
 	mOnComplete.clear();
-	mLock.unlock();
 
 	if (isComplete() && !isFailed() && mLedger)
 	{
@@ -210,11 +226,13 @@ void LedgerAcquire::done()
 		triggers[i](shared_from_this());
 }
 
-void LedgerAcquire::addOnComplete(boost::function<void (LedgerAcquire::pointer)> trigger)
+bool LedgerAcquire::addOnComplete(boost::function<void (LedgerAcquire::pointer)> trigger)
 {
-	mLock.lock();
+	boost::recursive_mutex::scoped_lock sl(mLock);
+	if (isDone())
+		return false;
 	mOnComplete.push_back(trigger);
-	mLock.unlock();
+	return true;
 }
 
 void LedgerAcquire::trigger(Peer::ref peer)
@@ -404,7 +422,8 @@ void LedgerAcquire::trigger(Peer::ref peer)
 
 	if (mComplete || mFailed)
 	{
-		cLog(lsDEBUG) << "Done:" << (mComplete ? " complete" : "") << (mFailed ? " failed" : "");
+		cLog(lsDEBUG) << "Done:" << (mComplete ? " complete" : "") << (mFailed ? " failed " : " ")
+			<< mLedger->getLedgerSeq();
 		done();
 	}
 }
@@ -645,8 +664,11 @@ LedgerAcquire::pointer LedgerAcquireMaster::findCreate(const uint256& hash)
 		return ptr;
 	}
 	ptr = boost::make_shared<LedgerAcquire>(hash);
-	ptr->addPeers();
+	if (!ptr->isDone())
-	ptr->setTimer(); // Cannot call in constructor
+	{
+		ptr->addPeers();
+		ptr->setTimer(); // Cannot call in constructor
+	}
 	return ptr;
 }
 
@@ -800,8 +822,15 @@ void LedgerAcquireMaster::sweep()
 
 int LedgerAcquireMaster::getFetchCount()
 {
-	boost::mutex::scoped_lock sl(mLock);
+	int ret = 0;
-	return mLedgers.size();
+	{
+		typedef std::pair<uint256, LedgerAcquire::pointer> u256_acq_pair;
+		boost::mutex::scoped_lock sl(mLock);
+		BOOST_FOREACH(const u256_acq_pair& it, mLedgers)
+			if (it.second->isActive())
+				++ret;
+	}
+	return ret;
 }
 
 // vim:ts=4

src/cpp/ripple/LedgerAcquire.h

@@ -50,6 +50,7 @@ public:
 	bool isFailed() const				{ return mFailed; }
 	int getTimeouts() const				{ return mTimeouts; }
 
+	bool isActive();
 	void progress()						{ mProgress = true; }
 	bool isProgress()					{ return mProgress; }
 	void touch()						{ mLastAction = time(NULL); }
@@ -110,7 +111,7 @@ public:
 	void abort()						{ mAborted = true; }
 	bool setAccept()					{ if (mAccept) return false; mAccept = true; return true; }
 
-	void addOnComplete(boost::function<void (LedgerAcquire::pointer)>);
+	bool addOnComplete(boost::function<void (LedgerAcquire::pointer)>);
 
 	bool takeBase(const std::string& data);
 	bool takeTxNode(const std::list<SHAMapNode>& IDs, const std::list<std::vector<unsigned char> >& data,

src/cpp/ripple/LedgerMaster.cpp

@@ -156,7 +156,7 @@ void LedgerMaster::asyncAccept(Ledger::pointer ledger)
 	resumeAcquiring();
 }
 
-bool LedgerMaster::acquireMissingLedger(const uint256& ledgerHash, uint32 ledgerSeq)
+bool LedgerMaster::acquireMissingLedger(Ledger::ref origLedger, const uint256& ledgerHash, uint32 ledgerSeq)
 { // return: false = already gave up recently
 	if (mTooFast)
 		return true;
@@ -189,7 +189,28 @@ bool LedgerMaster::acquireMissingLedger(const uint256& ledgerHash, uint32 ledger
 	}
 	mMissingSeq = ledgerSeq;
 	if (mMissingLedger->setAccept())
-		mMissingLedger->addOnComplete(boost::bind(&LedgerMaster::missingAcquireComplete, this, _1));
+	{
+		if (!mMissingLedger->addOnComplete(boost::bind(&LedgerMaster::missingAcquireComplete, this, _1)))
+			theApp->getIOService().post(boost::bind(&LedgerMaster::missingAcquireComplete, this, mMissingLedger));
+	}
+
+	if (theApp->getMasterLedgerAcquire().getFetchCount() < 5)
+	{
+		int count = 0;
+		typedef std::pair<uint32, uint256> u_pair;
+
+		std::vector<u_pair> vec = origLedger->getLedgerHashes();
+		BOOST_REVERSE_FOREACH(const u_pair& it, vec)
+		{
+			if ((count < 2) && (it.first < ledgerSeq) &&
+				!mCompleteLedgers.hasValue(it.first) && !theApp->getMasterLedgerAcquire().find(it.second))
+			{
+				++count;
+				theApp->getMasterLedgerAcquire().findCreate(it.second);
+			}
+		}
+	}
+
 	return true;
 }
 
@@ -250,7 +271,7 @@ void LedgerMaster::resumeAcquiring()
 		assert(!mCompleteLedgers.hasValue(prevMissing));
 		Ledger::pointer nextLedger = getLedgerBySeq(prevMissing + 1);
 		if (nextLedger)
-			acquireMissingLedger(nextLedger->getParentHash(), nextLedger->getLedgerSeq() - 1);
+			acquireMissingLedger(nextLedger, nextLedger->getParentHash(), nextLedger->getLedgerSeq() - 1);
 		else
 		{
 			mCompleteLedgers.clearValue(prevMissing);
@@ -333,7 +354,7 @@ void LedgerMaster::setFullLedger(Ledger::ref ledger)
 		if (!shouldAcquire(mCurrentLedger->getLedgerSeq(), theConfig.LEDGER_HISTORY, ledger->getLedgerSeq() - 1))
 			return;
 		cLog(lsDEBUG) << "We need the ledger before the ledger we just accepted: " << ledger->getLedgerSeq() - 1;
-		acquireMissingLedger(ledger->getParentHash(), ledger->getLedgerSeq() - 1);
+		acquireMissingLedger(ledger, ledger->getParentHash(), ledger->getLedgerSeq() - 1);
 	}
 	else
 	{
@@ -349,7 +370,7 @@ void LedgerMaster::setFullLedger(Ledger::ref ledger)
 			assert(!mCompleteLedgers.hasValue(prevMissing));
 			Ledger::pointer nextLedger = getLedgerBySeq(prevMissing + 1);
 			if (nextLedger)
-				acquireMissingLedger(nextLedger->getParentHash(), nextLedger->getLedgerSeq() - 1);
+				acquireMissingLedger(ledger, nextLedger->getParentHash(), nextLedger->getLedgerSeq() - 1);
 			else
 			{
 				mCompleteLedgers.clearValue(prevMissing);

src/cpp/ripple/LedgerMaster.h

@@ -51,7 +51,7 @@ protected:
 	bool isValidTransaction(const Transaction::pointer& trans);
 	bool isTransactionOnFutureList(const Transaction::pointer& trans);
 
-	bool acquireMissingLedger(const uint256& ledgerHash, uint32 ledgerSeq);
+	bool acquireMissingLedger(Ledger::ref from, const uint256& ledgerHash, uint32 ledgerSeq);
 	void asyncAccept(Ledger::pointer);
 	void missingAcquireComplete(LedgerAcquire::pointer);
 	void pubThread();