Reformatting using AStyle

This commit is contained in:
Vinnie Falco
2013-06-14 08:45:13 -07:00
parent 36bd8f7173
commit 521e812fc4
294 changed files with 54609 additions and 47598 deletions

View File

@@ -11,110 +11,126 @@
// FIXME: Need to clean up ledgers by index at some point
LedgerHistory::LedgerHistory() : mLedgersByHash("LedgerCache", CACHED_LEDGER_NUM, CACHED_LEDGER_AGE)
{ ; }
void LedgerHistory::addLedger(Ledger::pointer ledger)
LedgerHistory::LedgerHistory () : mLedgersByHash ("LedgerCache", CACHED_LEDGER_NUM, CACHED_LEDGER_AGE)
{
assert(ledger->isImmutable());
mLedgersByHash.canonicalize(ledger->getHash(), ledger, true);
;
}
void LedgerHistory::addAcceptedLedger(Ledger::pointer ledger, bool fromConsensus)
void LedgerHistory::addLedger (Ledger::pointer ledger)
{
assert(ledger && ledger->isAccepted() && ledger->isImmutable());
assert(ledger->peekAccountStateMap()->getHash().isNonZero());
uint256 h(ledger->getHash());
boost::recursive_mutex::scoped_lock sl(mLedgersByHash.peekMutex());
mLedgersByHash.canonicalize(h, ledger, true);
assert(ledger);
assert(ledger->isAccepted());
assert(ledger->isImmutable());
mLedgersByIndex[ledger->getLedgerSeq()] = ledger->getHash();
ledger->pendSave(fromConsensus);
assert (ledger->isImmutable ());
mLedgersByHash.canonicalize (ledger->getHash (), ledger, true);
}
uint256 LedgerHistory::getLedgerHash(uint32 index)
void LedgerHistory::addAcceptedLedger (Ledger::pointer ledger, bool fromConsensus)
{
boost::recursive_mutex::scoped_lock sl(mLedgersByHash.peekMutex());
std::map<uint32, uint256>::iterator it(mLedgersByIndex.find(index));
if (it != mLedgersByIndex.end())
return it->second;
sl.unlock();
return uint256();
assert (ledger && ledger->isAccepted () && ledger->isImmutable ());
assert (ledger->peekAccountStateMap ()->getHash ().isNonZero ());
uint256 h (ledger->getHash ());
boost::recursive_mutex::scoped_lock sl (mLedgersByHash.peekMutex ());
mLedgersByHash.canonicalize (h, ledger, true);
assert (ledger);
assert (ledger->isAccepted ());
assert (ledger->isImmutable ());
mLedgersByIndex[ledger->getLedgerSeq ()] = ledger->getHash ();
ledger->pendSave (fromConsensus);
}
Ledger::pointer LedgerHistory::getLedgerBySeq(uint32 index)
uint256 LedgerHistory::getLedgerHash (uint32 index)
{
boost::recursive_mutex::scoped_lock sl(mLedgersByHash.peekMutex());
std::map<uint32, uint256>::iterator it(mLedgersByIndex.find(index));
if (it != mLedgersByIndex.end())
{
uint256 hash = it->second;
sl.unlock();
return getLedgerByHash(hash);
}
sl.unlock();
boost::recursive_mutex::scoped_lock sl (mLedgersByHash.peekMutex ());
std::map<uint32, uint256>::iterator it (mLedgersByIndex.find (index));
Ledger::pointer ret(Ledger::loadByIndex(index));
if (!ret)
return ret;
assert(ret->getLedgerSeq() == index);
if (it != mLedgersByIndex.end ())
return it->second;
sl.lock();
assert(ret->isImmutable());
mLedgersByHash.canonicalize(ret->getHash(), ret);
mLedgersByIndex[ret->getLedgerSeq()] = ret->getHash();
return (ret->getLedgerSeq() == index) ? ret : Ledger::pointer();
sl.unlock ();
return uint256 ();
}
Ledger::pointer LedgerHistory::getLedgerByHash(uint256 const& hash)
Ledger::pointer LedgerHistory::getLedgerBySeq (uint32 index)
{
Ledger::pointer ret = mLedgersByHash.fetch(hash);
if (ret)
{
assert(ret->isImmutable());
assert(ret->getHash() == hash); // FIXME: We seem to be getting these
return ret;
}
boost::recursive_mutex::scoped_lock sl (mLedgersByHash.peekMutex ());
std::map<uint32, uint256>::iterator it (mLedgersByIndex.find (index));
ret = Ledger::loadByHash(hash);
if (!ret)
return ret;
assert(ret->isImmutable());
assert(ret->getHash() == hash);
mLedgersByHash.canonicalize(ret->getHash(), ret);
assert(ret->getHash() == hash);
if (it != mLedgersByIndex.end ())
{
uint256 hash = it->second;
sl.unlock ();
return getLedgerByHash (hash);
}
return ret;
sl.unlock ();
Ledger::pointer ret (Ledger::loadByIndex (index));
if (!ret)
return ret;
assert (ret->getLedgerSeq () == index);
sl.lock ();
assert (ret->isImmutable ());
mLedgersByHash.canonicalize (ret->getHash (), ret);
mLedgersByIndex[ret->getLedgerSeq ()] = ret->getHash ();
return (ret->getLedgerSeq () == index) ? ret : Ledger::pointer ();
}
Ledger::pointer LedgerHistory::canonicalizeLedger(Ledger::pointer ledger, bool save)
Ledger::pointer LedgerHistory::getLedgerByHash (uint256 const& hash)
{
assert(ledger->isImmutable());
uint256 h(ledger->getHash());
Ledger::pointer ret = mLedgersByHash.fetch (hash);
if (!save)
{ // return input ledger if not in map, otherwise, return corresponding map ledger
Ledger::pointer ret = mLedgersByHash.fetch(h);
if (ret)
return ret;
return ledger;
}
if (ret)
{
assert (ret->isImmutable ());
assert (ret->getHash () == hash); // FIXME: We seem to be getting these
return ret;
}
// save input ledger in map if not in map, otherwise return corresponding map ledger
boost::recursive_mutex::scoped_lock sl(mLedgersByHash.peekMutex());
mLedgersByHash.canonicalize(h, ledger);
if (ledger->isAccepted())
mLedgersByIndex[ledger->getLedgerSeq()] = ledger->getHash();
return ledger;
ret = Ledger::loadByHash (hash);
if (!ret)
return ret;
assert (ret->isImmutable ());
assert (ret->getHash () == hash);
mLedgersByHash.canonicalize (ret->getHash (), ret);
assert (ret->getHash () == hash);
return ret;
}
void LedgerHistory::tune(int size, int age)
Ledger::pointer LedgerHistory::canonicalizeLedger (Ledger::pointer ledger, bool save)
{
mLedgersByHash.setTargetSize(size);
mLedgersByHash.setTargetAge(age);
assert (ledger->isImmutable ());
uint256 h (ledger->getHash ());
if (!save)
{
// return input ledger if not in map, otherwise, return corresponding map ledger
Ledger::pointer ret = mLedgersByHash.fetch (h);
if (ret)
return ret;
return ledger;
}
// save input ledger in map if not in map, otherwise return corresponding map ledger
boost::recursive_mutex::scoped_lock sl (mLedgersByHash.peekMutex ());
mLedgersByHash.canonicalize (h, ledger);
if (ledger->isAccepted ())
mLedgersByIndex[ledger->getLedgerSeq ()] = ledger->getHash ();
return ledger;
}
void LedgerHistory::tune (int size, int age)
{
mLedgersByHash.setTargetSize (size);
mLedgersByHash.setTargetAge (age);
}
// vim:ts=4