ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reserve correct vector size for fee calculations:

Browse Source 
* Using txnsExpected_, which is influenced by both the config
  and network behavior, can reserve far too much or far too
  little memory, wasting time and resources.
* Not an issue during normal operation, but a user could
  cause problems on their local node with extreme configuration
  settings.
This commit is contained in:
Edward Hennis
2018-11-28 18:50:02 -05:00
committed by Nik Bougalis
parent 259fb1c32e
commit 2432f13903
2 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ripple/app/misc/impl/TxQ.cpp
View File

@@ -83,15 +83,20 @@ TxQ::FeeMetrics::update(Application& app,
TxQ::Setup const& setup)
{
std::vector<uint64_t> feeLevels;
feeLevels.reserve(txnsExpected_);
for (auto const& tx : view.txs)
{
auto const baseFee = calculateBaseFee(view, *tx.first);
feeLevels.push_back(getFeeLevelPaid(*tx.first,
baseLevel, baseFee, setup));
}
auto const txBegin = view.txs.begin();
auto const txEnd = view.txs.end();
auto const size = std::distance(txBegin, txEnd);
feeLevels.reserve(size);
std::for_each(txBegin, txEnd,
[&](auto const& tx)
{
auto const baseFee = calculateBaseFee(view, *tx.first);
feeLevels.push_back(getFeeLevelPaid(*tx.first,
baseLevel, baseFee, setup));
}
);
std::sort(feeLevels.begin(), feeLevels.end());
auto const size = feeLevels.size();
assert(size == feeLevels.size());
JLOG(j_.debug()) << "Ledger " << view.info().seq <<
" has " << size << " transactions. " <<