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

Count a validation for its previous ledger if it's during consensus time.

Browse Source
This commit is contained in:
JoelKatz
2012-09-05 10:05:15 -07:00
parent 7785b89b5d
commit 1dfdf8e9d8
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ValidationCollection.cpp
View File

@@ -41,6 +41,7 @@ bool ValidationCollection::addValidation(const SerializedValidation::pointer& va
it->second = val;
else if (val->getSignTime() > it->second->getSignTime())
{
val->setPreviousHash(it->second->getPreviousHash());
mStaleValidations.push_back(it->second);
it->second = val;
condWrite();
@@ -128,9 +129,11 @@ int ValidationCollection::getCurrentValidationCount(uint32 afterTime)
return count;
}
boost::unordered_map<uint256, int> ValidationCollection::getCurrentValidations()
boost::unordered_map<uint256, int> ValidationCollection::getCurrentValidations(uint256 currentLedger)
{
uint32 cutoff = theApp->getOPs().getNetworkTimeNC() - LEDGER_VAL_INTERVAL;
bool valCurrentLedger = currentLedger.isNonZero();
boost::unordered_map<uint256, int> ret;
{
@@ -149,7 +152,10 @@ boost::unordered_map<uint256, int> ValidationCollection::getCurrentValidations()
}
else
{ // contains a live record
++ret[it->second->getLedgerHash()];
if (valCurrentLedger && it->second->isPreviousHash(currentLedger))
++ret[currentLedger]; // count for the favored ledger
else
++ret[it->second->getLedgerHash()];
++it;
}
}
@@ -160,6 +166,7 @@ boost::unordered_map<uint256, int> ValidationCollection::getCurrentValidations()
bool ValidationCollection::isDeadLedger(const uint256& ledger)
{
boost::mutex::scoped_lock sl(mValidationLock);
BOOST_FOREACH(const uint256& it, mDeadLedgers)
if (it == ledger)
return true;
@@ -168,11 +175,13 @@ bool ValidationCollection::isDeadLedger(const uint256& ledger)
void ValidationCollection::addDeadLedger(const uint256& ledger)
{
boost::mutex::scoped_lock sl(mValidationLock);
if (isDeadLedger(ledger))
return;
mDeadLedgers.push_back(ledger);
if (mDeadLedgers.size() >= 128)
if (mDeadLedgers.size() >= 32)
mDeadLedgers.pop_front();
}
@@ -220,13 +229,11 @@ void ValidationCollection::doWrite()
std::vector<SerializedValidation::pointer> vector;
mStaleValidations.swap(vector);
sl.unlock();
{
ScopedLock dbl(theApp->getLedgerDB()->getDBLock());
Database *db = theApp->getLedgerDB()->getDB();
ScopedLock dbl(theApp->getLedgerDB()->getDBLock());
db->executeSQL("BEGIN TRANSACTION;");
BOOST_FOREACH(const SerializedValidation::pointer& it, vector)
db->executeSQL(boost::str(insVal % it->getLedgerHash().GetHex()
% it->getSignerPublic().humanNodePublic() % it->getFlags() % it->getSignTime()