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

Fix confirming set contains check

Browse source
This commit is contained in:
Piotr Wójcik 2024-10-17 17:30:05 +02:00
commit 6542a7851f
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nano/node/confirming_set.cpp
View file

@ -76,7 +76,7 @@ void nano::confirming_set::stop ()
bool nano::confirming_set::contains (nano::block_hash const & hash) const bool nano::confirming_set::contains (nano::block_hash const & hash) const
{ {
std::lock_guard lock{ mutex }; std::lock_guard lock{ mutex };
return set.get<tag_hash> ().contains (hash); return set.get<tag_hash> ().contains (hash) || current.contains (hash);
} }
std::size_t nano::confirming_set::size () const std::size_t nano::confirming_set::size () const
@ -130,6 +130,13 @@ void nano::confirming_set::run_batch (std::unique_lock<std::mutex> & lock)
auto batch = next_batch (config.batch_size); auto batch = next_batch (config.batch_size);
// Keep track of the blocks we're currently cementing, so that the .contains (...) check is accurate
debug_assert (current.empty ());
for (auto const & [hash, election] : batch)
{
current.insert (hash);
}
lock.unlock (); lock.unlock ();
auto notify = [this, &cemented] () { auto notify = [this, &cemented] () {
@ -218,6 +225,10 @@ void nano::confirming_set::run_batch (std::unique_lock<std::mutex> & lock)
release_assert (cemented.empty ()); release_assert (cemented.empty ());
already_cemented.notify (already); already_cemented.notify (already);
lock.lock ();
current.clear ();
lock.unlock ();
} }
nano::container_info nano::confirming_set::container_info () const nano::container_info nano::confirming_set::container_info () const

1
nano/node/confirming_set.hpp
View file

@ -102,6 +102,7 @@ private:
// clang-format on // clang-format on
ordered_entries set; ordered_entries set;
std::unordered_set<nano::block_hash> current;
nano::thread_pool notification_workers; nano::thread_pool notification_workers;