ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups.

Browse Source
This commit is contained in:
JoelKatz
2012-05-17 23:54:09 -07:00
parent a2613dd785
commit 45b230c06b
3 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/SHAMap.cpp
View File

@@ -12,7 +12,7 @@
SHAMap::SHAMap(uint32 seq) : mSeq(seq), mState(Modifying) SHAMap::SHAMap(uint32 seq) : mSeq(seq), mState(Modifying)
{ {
root = boost::make_shared<SHAMapTreeNode>(SHAMapNode(0, uint256()), mSeq); root = boost::make_shared<SHAMapTreeNode>(mSeq, SHAMapNode(0, uint256()));
root->makeInner(); root->makeInner();
mTNByID[*root] = root; mTNByID[*root] = root;
} }
@@ -88,6 +88,7 @@ SHAMapTreeNode::pointer SHAMap::checkCacheNode(const SHAMapNode& iNode)
SHAMapTreeNode::pointer SHAMap::walkTo(const uint256& id, bool modify) SHAMapTreeNode::pointer SHAMap::walkTo(const uint256& id, bool modify)
{ // walk down to the terminal node for this ID { // walk down to the terminal node for this ID
SHAMapTreeNode::pointer inNode = root; SHAMapTreeNode::pointer inNode = root;
while (!inNode->isLeaf()) while (!inNode->isLeaf())
@@ -323,10 +324,10 @@ SHAMapItem::pointer SHAMap::peekPrevItem(const uint256& id)
else for(int i=node->selectBranch(id)-1; i>=0; i--) else for(int i=node->selectBranch(id)-1; i>=0; i--)
if(!node->isEmptyBranch(i)) if(!node->isEmptyBranch(i))
{ {
node=getNode(node->getChildNodeID(i), node->getChildHash(i), false); node = getNode(node->getChildNodeID(i), node->getChildHash(i), false);
if(!node) throw SHAMapException(MissingNode); if(!node) throw SHAMapException(MissingNode);
SHAMapItem::pointer item=firstBelow(node); SHAMapItem::pointer item = firstBelow(node);
if(!item) throw SHAMapException(MissingNode); if (!item) throw SHAMapException(MissingNode);
return item; return item;
} }
} }
@@ -337,8 +338,8 @@ SHAMapItem::pointer SHAMap::peekPrevItem(const uint256& id)
SHAMapItem::pointer SHAMap::peekItem(const uint256& id) SHAMapItem::pointer SHAMap::peekItem(const uint256& id)
{ {
boost::recursive_mutex::scoped_lock sl(mLock); boost::recursive_mutex::scoped_lock sl(mLock);
SHAMapTreeNode::pointer leaf=walkTo(id, false); SHAMapTreeNode::pointer leaf = walkTo(id, false);
if(!leaf) return SHAMapItem::pointer(); if (!leaf) return SHAMapItem::pointer();
return leaf->peekItem(); return leaf->peekItem();
} }
@@ -433,7 +434,7 @@ bool SHAMap::addGiveItem(SHAMapItem::pointer item, bool isTransaction)
std::stack<SHAMapTreeNode::pointer> stack = getStack(tag, true); std::stack<SHAMapTreeNode::pointer> stack = getStack(tag, true);
if (stack.empty()) throw SHAMapException(MissingNode); if (stack.empty()) throw SHAMapException(MissingNode);
SHAMapTreeNode::pointer node=stack.top(); SHAMapTreeNode::pointer node = stack.top();
stack.pop(); stack.pop();
if (node->isLeaf() && (node->peekItem()->getTag() == tag)) if (node->isLeaf() && (node->peekItem()->getTag() == tag))
@@ -464,9 +465,10 @@ bool SHAMap::addGiveItem(SHAMapItem::pointer item, bool isTransaction)
{ // this is a leaf node that has to be made an inner node holding two items { // this is a leaf node that has to be made an inner node holding two items
#ifdef ST_DEBUG #ifdef ST_DEBUG
std::cerr << "aGI leaf " << node->getString() << std::endl; std::cerr << "aGI leaf " << node->getString() << std::endl;
std::cerr << "Existing: " << node->peekItem()->getTag().GetHex() << std::endl;
#endif #endif
SHAMapItem::pointer otherItem = node->peekItem(); SHAMapItem::pointer otherItem = node->peekItem();
assert(otherItem && (tag != otherItem->getTag()) ); assert(otherItem && (tag != otherItem->getTag()));
node->makeInner(); node->makeInner();
@@ -475,10 +477,11 @@ bool SHAMap::addGiveItem(SHAMapItem::pointer item, bool isTransaction)
while ((b1 = node->selectBranch(tag)) == (b2 = node->selectBranch(otherItem->getTag()))) while ((b1 = node->selectBranch(tag)) == (b2 = node->selectBranch(otherItem->getTag())))
{ // we need a new inner node, since both go on same branch at this level { // we need a new inner node, since both go on same branch at this level
#ifdef ST_DEBUG #ifdef ST_DEBUG
std::cerr << "need new inner node at " << node->getDepth() << std::endl; std::cerr << "need new inner node at " << node->getDepth() << ", "
<< b1 << "==" << b2 << std::endl;
#endif #endif
SHAMapTreeNode::pointer newNode = SHAMapTreeNode::pointer newNode =
boost::make_shared<SHAMapTreeNode>(node->getChildNodeID(b1), mSeq); boost::make_shared<SHAMapTreeNode>(mSeq, node->getChildNodeID(b1));
newNode->makeInner(); newNode->makeInner();
if(!mTNByID.insert(std::make_pair(SHAMapNode(*newNode), newNode)).second) if(!mTNByID.insert(std::make_pair(SHAMapNode(*newNode), newNode)).second)
assert(false); assert(false);
@@ -607,8 +610,8 @@ void SHAMap::dump(bool hash)
std::cerr << " MAP Contains" << std::endl; std::cerr << " MAP Contains" << std::endl;
boost::recursive_mutex::scoped_lock sl(mLock); boost::recursive_mutex::scoped_lock sl(mLock);
for(boost::unordered_map<SHAMapNode, SHAMapTreeNode::pointer, hash_SMN>::iterator it=mTNByID.begin(); for(boost::unordered_map<SHAMapNode, SHAMapTreeNode::pointer, hash_SMN>::iterator it = mTNByID.begin();
it!=mTNByID.end(); ++it) it != mTNByID.end(); ++it)
{ {
std::cerr << it->second->getString() << std::endl; std::cerr << it->second->getString() << std::endl;
if(hash) std::cerr << " " << it->second->getNodeHash().GetHex() << std::endl; if(hash) std::cerr << " " << it->second->getNodeHash().GetHex() << std::endl;

2
src/SHAMap.h
View File

@@ -153,7 +153,7 @@ private:
SHAMapTreeNode& operator=(const SHAMapTreeNode&); // no implementation SHAMapTreeNode& operator=(const SHAMapTreeNode&); // no implementation
public: public:
SHAMapTreeNode(const SHAMapNode& nodeID, uint32 seq); // empty node SHAMapTreeNode(uint32 seq, const SHAMapNode& nodeID); // empty node
SHAMapTreeNode(const SHAMapTreeNode& node, uint32 seq); // copy node from older tree SHAMapTreeNode(const SHAMapTreeNode& node, uint32 seq); // copy node from older tree
SHAMapTreeNode(const SHAMapNode& nodeID, SHAMapItem::pointer item, TNType type, uint32 seq); SHAMapTreeNode(const SHAMapNode& nodeID, SHAMapItem::pointer item, TNType type, uint32 seq);

29
src/SHAMapNodes.cpp
View File

@@ -74,18 +74,18 @@ bool SHAMapNode::operator!=(const uint256 &s) const
void SHAMapNode::ClassInit() void SHAMapNode::ClassInit()
{ // set up the depth masks { // set up the depth masks
uint256 selector; uint256 selector;
for(int i=0; i<64; i+=2) for(int i = 0; i < 64; i += 2)
{ {
smMasks[i]=selector; smMasks[i] = selector;
*(selector.begin()+(i/2))=0x0F; *(selector.begin() + (i / 2)) = 0x0F;
smMasks[i+1]=selector; smMasks[i + 1]=selector;
*(selector.begin()+(i/2))=0xFF; *(selector.begin() + (i / 2)) = 0xFF;
} }
} }
uint256 SHAMapNode::getNodeID(int depth, const uint256& hash) uint256 SHAMapNode::getNodeID(int depth, const uint256& hash)
{ {
assert(depth>=0 && depth<64); assert(depth >= 0 && depth < 64);
return hash & smMasks[depth]; return hash & smMasks[depth];
} }
@@ -134,6 +134,7 @@ int SHAMapNode::selectBranch(const uint256& hash) const
assert(false); assert(false);
return -1; return -1;
} }
if ((hash & smMasks[mDepth]) != mNodeID) if ((hash & smMasks[mDepth]) != mNodeID)
{ {
std::cerr << "selectBranch(" << getString() << std::endl; std::cerr << "selectBranch(" << getString() << std::endl;
@@ -155,15 +156,15 @@ void SHAMapNode::dump() const
std::cerr << getString() << std::endl; std::cerr << getString() << std::endl;
} }
SHAMapTreeNode::SHAMapTreeNode(const SHAMapNode& nodeID, uint32 seq) : SHAMapNode(nodeID), mHash(0), mSeq(seq), SHAMapTreeNode::SHAMapTreeNode(uint32 seq, const SHAMapNode& nodeID) : SHAMapNode(nodeID), mHash(0), mSeq(seq),
mType(tnERROR), mFullBelow(false) mType(tnERROR), mFullBelow(false)
{ {
} }
SHAMapTreeNode::SHAMapTreeNode(const SHAMapTreeNode& node, uint32 seq) : SHAMapNode(node), SHAMapTreeNode::SHAMapTreeNode(const SHAMapTreeNode& node, uint32 seq) : SHAMapNode(node),
mHash(node.mHash), mItem(node.mItem), mSeq(seq), mType(node.mType), mFullBelow(false) mHash(node.mHash), mSeq(seq), mType(node.mType), mFullBelow(false)
{ {
if(node.mItem) if (node.mItem)
mItem = boost::make_shared<SHAMapItem>(*node.mItem); mItem = boost::make_shared<SHAMapItem>(*node.mItem);
else else
memcpy(mHashes, node.mHashes, sizeof(mHashes)); memcpy(mHashes, node.mHashes, sizeof(mHashes));
@@ -342,13 +343,19 @@ std::string SHAMapTreeNode::getString() const
for(int i = 0; i < 16; ++i) for(int i = 0; i < 16; ++i)
if (!isEmptyBranch(i)) if (!isEmptyBranch(i))
{ {
ret += ",b"; ret += "\nb";
ret += boost::lexical_cast<std::string>(i); ret += boost::lexical_cast<std::string>(i);
ret += " = ";
ret += mHashes[i].GetHex();
} }
} }
if (isLeaf()) if (isLeaf())
{ {
ret += ",leaf"; ret += ",leaf\n";
ret += " Tag=";
ret += getTag().GetHex();
ret += "\n Hash=";
ret += mHash.GetHex();
} }
return ret; return ret;
} }