Improve collect_container_info ()

nano/node/node.cpp

@@ -523,7 +523,7 @@ std::unique_ptr<nano::container_info_component> nano::collect_container_info (no
 	composite->add_component (collect_container_info (node.observers, "observers"));
 	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 (node.rep_crawler.collect_container_info ("rep_crawler"));
 	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"));

nano/node/repcrawler.cpp

@@ -440,13 +440,23 @@ std::vector<nano::representative> nano::rep_crawler::principal_representatives (
 	return representatives (count, node.minimum_principal_weight (), minimum_protocol_version);
 }
 
-/** Total number of representatives */
 std::size_t nano::rep_crawler::representative_count ()
 {
 	nano::lock_guard<nano::mutex> lock{ mutex };
 	return reps.size ();
 }
 
+std::unique_ptr<nano::container_info_component> nano::rep_crawler::collect_container_info (const std::string & name)
+{
+	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{ "reps", reps.size (), sizeof (decltype (reps)::value_type) }));
+	composite->add_component (std::make_unique<container_info_leaf> (container_info{ "queries", queries.size (), sizeof (decltype (queries)::value_type) }));
+	composite->add_component (std::make_unique<container_info_leaf> (container_info{ "responses", responses.size (), sizeof (decltype (responses)::value_type) }));
+	return composite;
+}
+
 // Only for tests
 void nano::rep_crawler::force_add_rep (const nano::account & account, const std::shared_ptr<nano::transport::channel> & channel)
 {
@@ -471,20 +481,6 @@ void nano::rep_crawler::force_query (const nano::block_hash & hash, const std::s
 	queries.emplace (query_entry{ hash, channel });
 }
 
-std::unique_ptr<nano::container_info_component> nano::collect_container_info (rep_crawler & rep_crawler, std::string const & name)
-{
-	std::size_t count;
-	{
-		nano::lock_guard<nano::mutex> guard{ rep_crawler.mutex };
-		count = rep_crawler.queries.size ();
-	}
-
-	auto const sizeof_element = sizeof (decltype (rep_crawler.queries)::value_type);
-	auto composite = std::make_unique<container_info_composite> (name);
-	composite->add_component (std::make_unique<container_info_leaf> (container_info{ "queries", count, sizeof_element }));
-	return composite;
-}
-
 /*
  * rep_crawler_config
  */

nano/node/repcrawler.hpp

@@ -50,8 +50,6 @@ class rep_crawler_config final
  */
 class rep_crawler final
 {
-	friend std::unique_ptr<container_info_component> collect_container_info (rep_crawler & rep_crawler, std::string const & name);
-
 public:
 	rep_crawler (rep_crawler_config const &, nano::node &);
 	~rep_crawler ();
@@ -88,9 +86,10 @@ class rep_crawler final
 	std::vector<representative> principal_representatives (std::size_t count = std::numeric_limits<std::size_t>::max (), std::optional<decltype (nano::network_constants::protocol_version)> const & minimum_protocol_version = {});
 
 	/** Total number of representatives */
-
 	std::size_t representative_count ();
 
+	std::unique_ptr<container_info_component> collect_container_info (std::string const & name);
+
 private: // Dependencies
 	rep_crawler_config const & config;
 	nano::node & node;
@@ -111,7 +110,7 @@ class rep_crawler final
 	/** Returns a list of endpoints to crawl. The total weight is passed in to avoid computing it twice. */
 	std::vector<std::shared_ptr<nano::transport::channel>> prepare_crawl_targets (bool sufficient_weight) const;
 	std::optional<hash_root_t> prepare_query_target ();
-	bool track_rep_request (hash_root_t hash_root, std::shared_ptr<nano::transport::channel> const & channel_a);
+	bool track_rep_request (hash_root_t hash_root, std::shared_ptr<nano::transport::channel> const & channel);
 
 private:
 	/**
@@ -190,6 +189,4 @@ class rep_crawler final
 	void force_process (std::shared_ptr<nano::vote> const & vote, std::shared_ptr<nano::transport::channel> const & channel);
 	void force_query (nano::block_hash const & hash, std::shared_ptr<nano::transport::channel> const & channel);
 };
-
-std::unique_ptr<container_info_component> collect_container_info (rep_crawler & rep_crawler, std::string const & name);
 }