Container info

nanocurrency · May 5, 2024 · 5ac4317 · 5ac4317
1 parent fafc24c
commit 5ac4317
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/nano/node/fair_queue.hpp b/nano/node/fair_queue.hpp
@@ -351,7 +351,7 @@ class fair_queue final
 	std::chrono::steady_clock::time_point last_update{};
 
 public:
-	std::unique_ptr<container_info_component> collect_container_info (std::string const & name)
+	std::unique_ptr<container_info_component> collect_container_info (std::string const & name) const
 	{
 		auto composite = std::make_unique<container_info_composite> (name);
 		composite->add_component (std::make_unique<container_info_leaf> (container_info{ "queues", queues_size (), sizeof (typename decltype (queues)::value_type) }));

diff --git a/nano/node/vote_processor.cpp b/nano/node/vote_processor.cpp
@@ -209,13 +209,11 @@ bool nano::vote_processor::empty () const
 
 std::unique_ptr<nano::container_info_component> nano::vote_processor::collect_container_info (std::string const & name) const
 {
-	std::size_t votes_count;
-	{
-		nano::lock_guard<nano::mutex> guard{ mutex };
-		votes_count = queue.size ();
-	}
+	nano::lock_guard<nano::mutex> guard{ mutex };
+
 	auto composite = std::make_unique<container_info_composite> (name);
-	composite->add_component (std::make_unique<container_info_leaf> (container_info{ "votes", votes_count, sizeof (decltype (queue)::value_type) }));
+	composite->add_component (std::make_unique<container_info_leaf> (container_info{ "votes", queue.size (), sizeof (decltype (queue)::value_type) }));
+	composite->add_component (queue.collect_container_info ("queue"));
 	return composite;
 }