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

Change collect_container_info to be a member of nano::block_processor (#4434)

Browse source 
Previously this free function was declared as a friend before it was declared as a function which gave a compiler warning.
This commit is contained in:
clemahieu 2024-02-14 12:32:23 +00:00 • committed by GitHub
commit dd5a00c1d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nano/node/blockprocessor.cpp
View file

@ -412,20 +412,20 @@ void nano::block_processor::queue_unchecked (store::write_transaction const & tr
node.unchecked.trigger (hash_or_account_a);
}
std::unique_ptr<nano::container_info_component> nano::collect_container_info (block_processor & block_processor, std::string const & name)
std::unique_ptr<nano::container_info_component> nano::block_processor::collect_container_info (std::string const & name)
{
std::size_t blocks_count;
std::size_t forced_count;
{
nano::lock_guard<nano::mutex> guard{ block_processor.mutex };
blocks_count = block_processor.blocks.size ();
forced_count = block_processor.forced.size ();
nano::lock_guard<nano::mutex> guard{ mutex };
blocks_count = blocks.size ();
forced_count = forced.size ();
}
auto composite = std::make_unique<container_info_composite> (name);
composite->add_component (std::make_unique<container_info_leaf> (container_info{ "blocks", blocks_count, sizeof (decltype (block_processor.blocks)::value_type) }));
composite->add_component (std::make_unique<container_info_leaf> (container_info{ "forced", forced_count, sizeof (decltype (block_processor.forced)::value_type) }));
composite->add_component (std::make_unique<container_info_leaf> (container_info{ "blocks", blocks_count, sizeof (decltype (blocks)::value_type) }));
composite->add_component (std::make_unique<container_info_leaf> (container_info{ "forced", forced_count, sizeof (decltype (forced)::value_type) }));
return composite;
}

3
nano/node/blockprocessor.hpp
View file

@ -75,6 +75,7 @@ public:
bool have_blocks_ready ();
bool have_blocks ();
void process_blocks ();
std::unique_ptr<container_info_component> collect_container_info (std::string const & name);
std::atomic<bool> flushing{ false };
@ -110,7 +111,5 @@ private:
nano::condition_variable condition;
nano::mutex mutex{ mutex_identifier (mutexes::block_processor) };
std::thread processing_thread;
friend std::unique_ptr<container_info_component> collect_container_info (block_processor & block_processor, std::string const & name);
};
}

2
nano/node/node.cpp
View file

@ -537,7 +537,7 @@ std::unique_ptr<nano::container_info_component> nano::collect_container_info (no
composite->add_component (collect_container_info (node.wallets, "wallets"));
composite->add_component (collect_container_info (node.vote_processor, "vote_processor"));
composite->add_component (collect_container_info (node.rep_crawler, "rep_crawler"));
composite->add_component (collect_container_info (node.block_processor, "block_processor"));
composite->add_component (node.block_processor.collect_container_info ("block_processor"));
composite->add_component (collect_container_info (node.online_reps, "online_reps"));
composite->add_component (collect_container_info (node.history, "history"));
composite->add_component (node.block_uniquer.collect_container_info ("block_uniquer"));