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

Browse Source 
Conflicts:
	src/main.cpp
This commit is contained in:
jed
2012-05-15 16:19:16 -07:00
parent fec2aeb579 cb4fcfddac
commit c6395b2203
24 changed files with 734 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/SHAMapSync.cpp
View File

@@ -15,9 +15,6 @@ void SHAMap::getMissingNodes(std::vector<SHAMapNode>& nodeIDs, std::vector<uint2
if(root->isFullBelow())
{
#ifdef GMN_DEBUG
std::cerr << "getMissingNodes: root is full below" << std::endl;
#endif
clearSynching();
return;
}
@@ -31,34 +28,23 @@ void SHAMap::getMissingNodes(std::vector<SHAMapNode>& nodeIDs, std::vector<uint2
std::stack<SHAMapTreeNode::pointer> stack;
stack.push(root);
while ((max > 0) && (!stack.empty()))
while (!stack.empty())
{
SHAMapTreeNode::pointer node = stack.top();
stack.pop();
#ifdef GMN_DEBUG
std::cerr << "gMN: popped " << node->getString() << std::endl;
#endif
for (int i = 0; i < 16; ++i)
if( !node->isEmptyBranch(i))
if (!node->isEmptyBranch(i))
{
#ifdef GMN_DEBUG
std::cerr << "gMN: " << node->getString() << " has non-empty branch " << i << std::endl;
#endif
SHAMapTreeNode::pointer desc = getNode(node->getChildNodeID(i), node->getChildHash(i), false);
if(desc)
if (!desc)
{
if (desc->isInner() && !desc->isFullBelow())
stack.push(desc);
}
else if (max-- > 0)
{
#ifdef GMN_DEBUG
std::cerr << "gMN: need " << node->getChildNodeID(i).getString() << std::endl;
#endif
nodeIDs.push_back(node->getChildNodeID(i));
if (--max <= 0)
return;
}
else if (desc->isInner() && !desc->isFullBelow())
stack.push(desc);
}
}
}