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

Keep one validation back to avoid a split case when some nodes have sent new validations and some haven't

Browse Source
This commit is contained in:
JoelKatz
2012-08-03 04:07:01 -07:00
parent 6815c7ef98
commit 5778cb1183
2 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/ValidationCollection.cpp
View File

@@ -19,6 +19,7 @@ bool ValidationCollection::addValidation(SerializedValidation::pointer val)
else
Log(lsWARNING) << "Received stale validation now=" << now << ", close=" << valClose;
}
else Log(lsINFO) << "Node " << signer.humanNodePublic() << " not in UNL";
uint256 hash = val->getLedgerHash();
uint160 node = signer.getNodeID();
@@ -29,13 +30,22 @@ bool ValidationCollection::addValidation(SerializedValidation::pointer val)
return false;
if (isCurrent)
{
boost::unordered_map<uint160, SerializedValidation::pointer>::iterator it = mCurrentValidations.find(node);
if ((it == mCurrentValidations.end()) || (val->getCloseTime() >= it->second->getCloseTime()))
boost::unordered_map<uint160, ValidationPair>::iterator it = mCurrentValidations.find(node);
if ((it == mCurrentValidations.end()) || (!it->second.newest) ||
(val->getCloseTime() > it->second.newest->getCloseTime()))
{
if (it != mCurrentValidations.end())
mStaleValidations.push_back(it->second);
mCurrentValidations[node] = val;
condWrite();
{
if (it->second.oldest)
{
mStaleValidations.push_back(it->second.oldest);
condWrite();
}
it->second.oldest = it->second.newest;
it->second.newest = val;
}
else
mCurrentValidations.insert(std::make_pair(node, ValidationPair(val)));
}
}
}
@@ -102,10 +112,10 @@ int ValidationCollection::getCurrentValidationCount(uint32 afterTime)
{
int count = 0;
boost::mutex::scoped_lock sl(mValidationLock);
for (boost::unordered_map<uint160, SerializedValidation::pointer>::iterator it = mCurrentValidations.begin(),
for (boost::unordered_map<uint160, ValidationPair>::iterator it = mCurrentValidations.begin(),
end = mCurrentValidations.end(); it != end; ++it)
{
if (it->second->isTrusted() && (it->second->getCloseTime() > afterTime))
if (it->second.newest->isTrusted() && (it->second.newest->getCloseTime() > afterTime))
++count;
}
return count;
@@ -118,19 +128,32 @@ boost::unordered_map<uint256, int> ValidationCollection::getCurrentValidations()
{
boost::mutex::scoped_lock sl(mValidationLock);
boost::unordered_map<uint160, SerializedValidation::pointer>::iterator it = mCurrentValidations.begin();
boost::unordered_map<uint160, ValidationPair>::iterator it = mCurrentValidations.begin();
bool anyNew = false;
while (it != mCurrentValidations.end())
{
if (now > (it->second->getCloseTime() + LEDGER_MAX_INTERVAL))
ValidationPair& pair = it->second;
if (pair.oldest && (now > (pair.oldest->getCloseTime() + LEDGER_MAX_INTERVAL)))
{
mStaleValidations.push_back(it->second);
it = mCurrentValidations.erase(it);
mStaleValidations.push_back(pair.oldest);
pair.oldest = SerializedValidation::pointer();
anyNew = true;
}
if (pair.newest && (now > (pair.newest->getCloseTime() + LEDGER_MAX_INTERVAL)))
{
mStaleValidations.push_back(pair.newest);
pair.newest = SerializedValidation::pointer();
anyNew = true;
}
if (!pair.newest && !pair.oldest)
it = mCurrentValidations.erase(it);
else
{
++ret[it->second->getLedgerHash()];
if (pair.newest)
++ret[pair.newest->getLedgerHash()];
if (pair.oldest)
++ret[pair.oldest->getLedgerHash()];
++it;
}
}
@@ -144,11 +167,14 @@ boost::unordered_map<uint256, int> ValidationCollection::getCurrentValidations()
void ValidationCollection::flush()
{
boost::mutex::scoped_lock sl(mValidationLock);
boost::unordered_map<uint160, SerializedValidation::pointer>::iterator it = mCurrentValidations.begin();
boost::unordered_map<uint160, ValidationPair>::iterator it = mCurrentValidations.begin();
bool anyNew = false;
while (it != mCurrentValidations.end())
{
mStaleValidations.push_back(it->second);
if (it->second.oldest)
mStaleValidations.push_back(it->second.oldest);
if (it->second.newest)
mStaleValidations.push_back(it->second.newest);
++it;
anyNew = true;
}

10
src/ValidationCollection.h
View File

@@ -12,13 +12,21 @@
typedef boost::unordered_map<uint160, SerializedValidation::pointer> ValidationSet;
class ValidationPair
{
public:
SerializedValidation::pointer oldest, newest;
ValidationPair(SerializedValidation::pointer v) : newest(v) { ; }
};
class ValidationCollection
{
protected:
boost::mutex mValidationLock;
boost::unordered_map<uint256, ValidationSet> mValidations;
boost::unordered_map<uint160, SerializedValidation::pointer> mCurrentValidations;
boost::unordered_map<uint160, ValidationPair> mCurrentValidations;
std::vector<SerializedValidation::pointer> mStaleValidations;
bool mWriting;