ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2026-06-03 00:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

move away from using bare pointers, use Ledger const references where possible

Browse Source
This commit is contained in:
Richard Holland
2025-03-05 20:51:16 +11:00
parent ac48b5a4dd
commit a6f2f9f27a
4 changed files with 66 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/ripple/rpc/handlers/Catalogue.cpp
View File

@@ -22,7 +22,6 @@
#include <ripple/app/tx/apply.h>
#include <ripple/basics/Log.h>
#include <ripple/basics/Slice.h>
#include <ripple/ledger/ReadView.h>
#include <ripple/net/RPCErr.h>
#include <ripple/protocol/ErrorCodes.h>
#include <ripple/protocol/LedgerFormats.h>
@@ -68,7 +67,7 @@ struct CATLHeader
class CatalogueProcessor
{
private:
std::vector<std::shared_ptr<ReadView const>>& ledgers;
std::vector<std::shared_ptr<Ledger const>>& ledgers;
std::ofstream& outfile;
beast::Journal journal;
std::atomic<bool> aborted{false};
@@ -88,7 +87,10 @@ private:
}
bool
outputLedger(ReadView const& ledger, SHAMap const* prevStateMap = nullptr)
outputLedger(
Ledger const& ledger,
std::optional<std::reference_wrapper<const SHAMap>> prevStateMap =
std::nullopt)
{
uint32_t seq = ledger.info().seq;
try
@@ -127,15 +129,10 @@ private:
return false;
}
auto& stateMap =
static_cast<const Ledger*>(ledger.get())->stateMap();
size_t stateNodesWritten =
stateMap.serializeToStream(outfile, prevStateMap);
ledger->stateMap().serializeToStream(outfile, prevStateMap);
auto& txMap = static_cast<const Ledger*>(ledger.get())->txMap();
size_t txNodesWritten = txMap.serializeToStream(outfile, nullptr);
size_t txNodesWritten = ledger->txMap().serializeToStream(outfile);
JLOG(journal.info()) << "Ledger " << seq << ": Wrote "
<< stateNodesWritten << " state nodes, "
@@ -154,7 +151,7 @@ private:
public:
CatalogueProcessor(
std::vector<std::shared_ptr<ReadView const>>& ledgers_,
std::vector<std::shared_ptr<Ledger const>>& ledgers_,
std::ofstream& outfile_,
beast::Journal journal_)
: ledgers(ledgers_), outfile(outfile_), journal(journal_)
@@ -178,18 +175,11 @@ public:
if (!outputLedger(*ledgers.front()))
return false;
// For subsequent ledgers, process as deltas from the previous
SHAMap const* prevStateMap =
&static_cast<const Ledger*>(ledgers.front().get())->stateMap();
for (size_t i = 1; i < ledgers.size(); ++i)
{
auto ledger = ledgers[i];
if (!outputLedger(*ledger, prevStateMap))
if (!outputLedger(*ledger, ledgers[i - 1]->stateMap()))
return false;
prevStateMap =
&static_cast<const Ledger*>(ledger.get())->stateMap();
}
return !aborted;
@@ -251,14 +241,14 @@ doCatalogueCreate(RPC::JsonContext& context)
if (min_ledger > max_ledger)
return rpcError(rpcINVALID_PARAMS, "min_ledger must be <= max_ledger");
std::vector<std::shared_ptr<ReadView const>> lpLedgers;
std::vector<std::shared_ptr<Ledger const>> lpLedgers;
// Grab all ledgers of interest
lpLedgers.reserve(max_ledger - min_ledger + 1);
for (auto i = min_ledger; i <= max_ledger; ++i)
{
std::shared_ptr<ReadView const> ptr;
std::shared_ptr<Ledger const> ptr;
auto status = RPC::getLedger(ptr, i, context);
if (status.toErrorCode() != rpcSUCCESS) // Status isn't OK
return rpcError(status);
@@ -440,8 +430,9 @@ doCatalogueLoad(RPC::JsonContext& context)
ledger->setLedgerInfo(info);
// Apply delta (only leaf-node changes)
if (!ledger->stateMap().deserializeFromStream(
infile, &prevLedger->stateMap()))
SHAMap const& prevMap = prevLedger->stateMap();
if (!ledger->stateMap().deserializeFromStream(infile, prevMap))
{
JLOG(context.j.error())
<< "Failed to apply delta to ledger " << info.seq;
@@ -450,8 +441,7 @@ doCatalogueLoad(RPC::JsonContext& context)
}
// pull in the tx map
if (!ledger->txMap().deserializeFromStream(
infile, &prevLedger->txMap()))
if (!ledger->txMap().deserializeFromStream(infile, prevLedger->txMap()))
{
JLOG(context.j.error())
<< "Failed to apply delta to ledger " << info.seq;

35
src/ripple/rpc/impl/RPCHelpers.cpp
View File

@@ -570,6 +570,19 @@ getLedger(T& ledger, uint256 const& ledgerHash, Context& context)
return Status::OK;
}
// Helper function to determine if the types are compatible for assignment
template <typename T, typename U>
struct is_assignable_shared_ptr : std::false_type
{
};
template <typename T>
struct is_assignable_shared_ptr<
std::shared_ptr<T>&,
std::shared_ptr<ReadView const>> : std::is_convertible<ReadView const*, T*>
{
};
template <class T>
Status
getLedger(T& ledger, uint32_t ledgerIndex, Context& context)
@@ -579,10 +592,14 @@ getLedger(T& ledger, uint32_t ledgerIndex, Context& context)
{
if (context.app.config().reporting())
return {rpcLGR_NOT_FOUND, "ledgerNotFound"};
auto cur = context.ledgerMaster.getCurrentLedger();
if (cur->info().seq == ledgerIndex)
{
ledger = cur;
if constexpr (is_assignable_shared_ptr<T, decltype(cur)>::value)
{
ledger = cur;
}
}
}
@@ -635,7 +652,12 @@ getLedger(T& ledger, LedgerShortcut shortcut, Context& context)
return {
rpcLGR_NOT_FOUND,
"Reporting does not track current ledger"};
ledger = context.ledgerMaster.getCurrentLedger();
auto cur = context.ledgerMaster.getCurrentLedger();
if constexpr (is_assignable_shared_ptr<T, decltype(cur)>::value)
{
ledger = cur;
}
assert(ledger->open());
}
else if (shortcut == LedgerShortcut::CLOSED)
@@ -685,6 +707,15 @@ getLedger<>(
template Status
getLedger<>(std::shared_ptr<ReadView const>&, uint256 const&, Context&);
template Status
getLedger<>(std::shared_ptr<Ledger const>&, uint32_t, Context&);
template Status
getLedger<>(std::shared_ptr<Ledger const>&, LedgerShortcut shortcut, Context&);
template Status
getLedger<>(std::shared_ptr<Ledger const>&, uint256 const&, Context&);
bool
isValidated(
LedgerMaster& ledgerMaster,

9
src/ripple/shamap/SHAMap.h
View File

@@ -380,8 +380,10 @@ public:
* @return Number of nodes written
*/
std::size_t
serializeToStream(std::ostream& stream, SHAMap const* baseSHAMap = nullptr)
const;
serializeToStream(
std::ostream& stream,
std::optional<std::reference_wrapper<const SHAMap>> baseSHAMap =
std::nullopt) const;
/**
* Deserialize a SHAMap from a stream
@@ -394,7 +396,8 @@ public:
bool
deserializeFromStream(
std::istream& stream,
SHAMap const* baseSHAMap = nullptr);
std::optional<std::reference_wrapper<const SHAMap>> baseSHAMap =
std::nullopt);
private:
using SharedPtrNodeStack =

19
src/ripple/shamap/impl/SHAMap.cpp
View File

@@ -1243,7 +1243,9 @@ SHAMap::invariants() const
}
std::size_t
SHAMap::serializeToStream(std::ostream& stream, SHAMap const* baseSHAMap) const
SHAMap::serializeToStream(
std::ostream& stream,
std::optional<std::reference_wrapper<const SHAMap>> baseSHAMap) const
{
std::unordered_set<SHAMapHash, beast::uhash<>> writtenNodes;
@@ -1286,15 +1288,16 @@ SHAMap::serializeToStream(std::ostream& stream, SHAMap const* baseSHAMap) const
};
// If we're creating a delta, first compute the differences
if (baseSHAMap && baseSHAMap->root_)
if (baseSHAMap && baseSHAMap->get().root_)
{
const SHAMap& baseMap = baseSHAMap->get();
// Only compute delta if the maps are different
if (getHash() != baseSHAMap->getHash())
if (getHash() != baseMap.getHash())
{
Delta differences;
if (compare(
*baseSHAMap, differences, std::numeric_limits<int>::max()))
if (compare(baseMap, differences, std::numeric_limits<int>::max()))
{
// Process each difference
for (auto const& [key, deltaItem] : differences)
@@ -1387,7 +1390,9 @@ SHAMap::serializeToStream(std::ostream& stream, SHAMap const* baseSHAMap) const
}
bool
SHAMap::deserializeFromStream(std::istream& stream, SHAMap const* baseSHAMap)
SHAMap::deserializeFromStream(
std::istream& stream,
std::optional<std::reference_wrapper<const SHAMap>> baseSHAMap)
{
try
{
@@ -1401,7 +1406,7 @@ SHAMap::deserializeFromStream(std::istream& stream, SHAMap const* baseSHAMap)
// If we have a base map, start with a copy of it
if (baseSHAMap)
{
root_ = baseSHAMap->root_;
root_ = baseSHAMap->get().root_;
if (root_)
unshare();
}