Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Replace random_access with sequenced in active_transactions (#3957)

Browse source
This commit is contained in:
Piotr Wójcik 2022-09-26 17:07:32 +02:00 • committed by GitHub
commit dbbab91743
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nano/node/active_transactions.cpp
View file

@ -313,7 +313,7 @@ std::vector<std::shared_ptr<nano::election>> nano::active_transactions::list_act
std::vector<std::shared_ptr<nano::election>> result_l;
result_l.reserve (std::min (max_a, roots.size ()));
{
auto & sorted_roots_l (roots.get<tag_random_access> ());
auto & sorted_roots_l (roots.get<tag_sequenced> ());
std::size_t count_l{ 0 };
for (auto i = sorted_roots_l.begin (), n = sorted_roots_l.end (); i != n && count_l < max_a; ++i, ++count_l)
{
@ -581,7 +581,7 @@ void nano::active_transactions::erase_oldest ()
if (!roots.empty ())
{
node.stats.inc (nano::stat::type::election, nano::stat::detail::election_drop_overflow);
auto item = roots.get<tag_random_access> ().front ();
auto item = roots.get<tag_sequenced> ().front ();
cleanup_election (lock, item.election);
}
}

6
nano/node/active_transactions.hpp
View file

@ -126,9 +126,8 @@ class active_transactions final
// clang-format off
class tag_account {};
class tag_random_access {};
class tag_root {};
class tag_sequence {};
class tag_sequenced {};
class tag_uncemented {};
class tag_arrival {};
class tag_hash {};
@ -138,13 +137,12 @@ public:
// clang-format off
using ordered_roots = boost::multi_index_container<conflict_info,
mi::indexed_by<
mi::random_access<mi::tag<tag_random_access>>,
mi::sequenced<mi::tag<tag_sequenced>>,
mi::hashed_unique<mi::tag<tag_root>,
mi::member<conflict_info, nano::qualified_root, &conflict_info::root>>
>>;
// clang-format on
ordered_roots roots;
using roots_iterator = active_transactions::ordered_roots::index_iterator<tag_root>::type;
explicit active_transactions (nano::node &, nano::confirmation_height_processor &);
~active_transactions ();