ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-27 22:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor treatment of Ledger:

Browse Source 
All handling of Ledger in shared_ptr is modified to
use a const managed object when the context requires
immutable semantics.
This commit is contained in:
Nik Bougalis
2016-02-21 16:56:18 -05:00
parent 77a4218a9e
commit 34e85ccb62
50 changed files with 788 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ripple/app/ledger/impl/LedgerCleaner.cpp
View File

@@ -269,7 +269,9 @@ private:
}
// VFALCO TODO This should return boost::optional<uint256>
LedgerHash getLedgerHash(Ledger::pointer ledger, LedgerIndex index)
LedgerHash getLedgerHash(
std::shared_ptr<ReadView const>& ledger,
LedgerIndex index)
{
boost::optional<LedgerHash> hash;
try
@@ -281,7 +283,7 @@ private:
JLOG (j_.warning) <<
"Node missing from ledger " << ledger->info().seq;
app_.getInboundLedgers().acquire (
ledger->getHash(), ledger->info().seq,
ledger->info().hash, ledger->info().seq,
InboundLedger::fcGENERIC);
}
return hash ? *hash : zero; // kludge
@@ -300,9 +302,8 @@ private:
bool doNodes,
bool doTxns)
{
Ledger::pointer nodeLedger =
app_.getInboundLedgers().acquire (
ledgerHash, ledgerIndex, InboundLedger::fcGENERIC);
auto nodeLedger = app_.getInboundLedgers().acquire (
ledgerHash, ledgerIndex, InboundLedger::fcGENERIC);
if (!nodeLedger)
{
JLOG (j_.debug) << "Ledger " << ledgerIndex << " not available";
@@ -312,9 +313,9 @@ private:
return false;
}
Ledger::pointer dbLedger = loadByIndex(ledgerIndex, app_);
auto dbLedger = loadByIndex(ledgerIndex, app_);
if (! dbLedger ||
(dbLedger->getHash() != ledgerHash) ||
(dbLedger->info().hash != ledgerHash) ||
(dbLedger->info().parentHash != nodeLedger->info().parentHash))
{
// Ideally we'd also check for more than one ledger with that index
@@ -355,7 +356,7 @@ private:
*/
LedgerHash getHash(
LedgerIndex const& ledgerIndex,
Ledger::pointer& referenceLedger)
std::shared_ptr<ReadView const>& referenceLedger)
{
LedgerHash ledgerHash;
@@ -411,7 +412,7 @@ private:
return shouldExit_;
};
Ledger::pointer goodLedger;
std::shared_ptr<ReadView const> goodLedger;
while (! shouldExit())
{