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' of github.com:jedmccaleb/NewCoin into develop

Browse Source
This commit is contained in:
Arthur Britto
2013-04-25 15:24:04 -07:00
parent 78c867d714 45fc2f0667
commit 1a5ce96584
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,7 +109,7 @@ LedgerAcquire::LedgerAcquire(const uint256& hash, uint32 seq) : PeerSet(hash, LE
void LedgerAcquire::checkLocal()
{
boost::recursive_mutex::scoped_lock sl(mLock);
if (mComplete)
if (isDone())
return;
if (tryLocal())
@@ -456,7 +456,8 @@ void LedgerAcquire::trigger(Peer::ref peer)
std::vector<uint256> nodeHashes;
nodeIDs.reserve(256);
nodeHashes.reserve(256);
mLedger->peekTransactionMap()->getMissingNodes(nodeIDs, nodeHashes, 256, NULL);
TransactionStateSF filter(mSeq);
mLedger->peekTransactionMap()->getMissingNodes(nodeIDs, nodeHashes, 256, &filter);
if (nodeIDs.empty())
{
if (!mLedger->peekTransactionMap()->isValid())
@@ -503,7 +504,8 @@ void LedgerAcquire::trigger(Peer::ref peer)
std::vector<uint256> nodeHashes;
nodeIDs.reserve(256);
nodeHashes.reserve(256);
mLedger->peekAccountStateMap()->getMissingNodes(nodeIDs, nodeHashes, 256, NULL);
TransactionStateSF filter(mSeq);
mLedger->peekAccountStateMap()->getMissingNodes(nodeIDs, nodeHashes, 256, &filter);
if (nodeIDs.empty())
{
if (!mLedger->peekAccountStateMap()->isValid())

5
src/cpp/ripple/LedgerMaster.cpp
View File

@@ -265,7 +265,7 @@ bool LedgerMaster::acquireMissingLedger(Ledger::ref origLedger, const uint256& l
{
typedef std::pair<uint32, uint256> u_pair;
std::vector<u_pair> vec = origLedger->getLedgerHashes();
BOOST_FOREACH(const u_pair& it, vec)
BOOST_REVERSE_FOREACH(const u_pair& it, vec)
{
if ((fetchCount < fetchMax) && (it.first < ledgerSeq) &&
!mCompleteLedgers.hasValue(it.first) && !theApp->getMasterLedgerAcquire().find(it.second))
@@ -277,7 +277,8 @@ bool LedgerMaster::acquireMissingLedger(Ledger::ref origLedger, const uint256& l
setFullLedger(acq->getLedger());
mLedgerHistory.addAcceptedLedger(acq->getLedger(), false);
}
else ++fetchCount;
else
++fetchCount;
}
}
}

2
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -2094,7 +2094,7 @@ bool NetworkOPs::getFetchPack(const uint256& hash, std::vector<unsigned char>& d
bool NetworkOPs::shouldFetchPack()
{
uint32 now = getNetworkTimeNC();
if (mLastFetchPack == now)
if ((mLastFetchPack == now) || ((mLastFetchPack + 1) == now))
return false;
mFetchPack.sweep();
if (mFetchPack.getCacheSize() > 384)

2
src/cpp/ripple/SHAMap.cpp
View File

@@ -733,6 +733,8 @@ SHAMapTreeNode::pointer SHAMap::fetchNodeExternal(const SHAMapNode& id, const ui
void SHAMap::fetchRoot(const uint256& hash, SHAMapSyncFilter* filter)
{
if (hash == root->getNodeHash())
return;
if (sLog(lsTRACE))
{
if (mType == smtTRANSACTION)

4
src/cpp/ripple/SHAMapSync.cpp
View File

@@ -136,13 +136,13 @@ std::vector<uint256> SHAMap::getNeededHashes(int max, SHAMapSyncFilter* filter)
if (!node->isEmptyBranch(branch))
{
const uint256& childHash = node->getChildHash(branch);
SHAMapNode childID = node->getChildNodeID(branch);
if (!fullBelowCache.isPresent(childHash))
{
SHAMapNode childID = node->getChildNodeID(branch);
SHAMapTreeNode* d = NULL;
try
{
d = getNodePointer(node->getChildNodeID(branch), childHash);
d = getNodePointer(childID, childHash);
assert(d);
}
catch (SHAMapMissingNode&)