Merge branch 'nanocurrency:develop' into cemented-observers-optimize

nano/lib/thread_roles.cpp

@@ -19,6 +19,9 @@ std::string nano::thread_role::get_string (nano::thread_role::name role)
 		case nano::thread_role::name::io:
 			thread_role_name_string = "I/O";
 			break;
+		case nano::thread_role::name::io_daemon:
+			thread_role_name_string = "I/O (daemon)";
+			break;
 		case nano::thread_role::name::work:
 			thread_role_name_string = "Work pool";
 			break;

nano/lib/thread_roles.hpp

@@ -11,6 +11,7 @@ enum class name
 {
 	unknown,
 	io,
+	io_daemon,
 	work,
 	message_processing,
 	vote_processing,

nano/nano_node/daemon.cpp

@@ -146,7 +146,7 @@ void nano::daemon::run (std::filesystem::path const & data_path, nano::node_flag
 				logger.info (nano::log::type::daemon, "Start time: {:%c} UTC", fmt::gmtime (dateTime));
 
 				// IO context runner should be started first and stopped last to allow asio handlers to execute during node start/stop
-				runner = std::make_unique<nano::thread_runner> (io_ctx, logger, node->config.io_threads);
+				runner = std::make_unique<nano::thread_runner> (io_ctx, logger, node->config.io_threads, nano::thread_role::name::io_daemon);
 
 				node->start ();
 

nano/nano_rpc/entry.cpp

@@ -51,7 +51,7 @@ void run (std::filesystem::path const & data_path, std::vector<std::string> cons
 
 		std::shared_ptr<boost::asio::io_context> io_ctx = std::make_shared<boost::asio::io_context> ();
 
-		runner = std::make_unique<nano::thread_runner> (io_ctx, logger, rpc_config.rpc_process.io_threads);
+		runner = std::make_unique<nano::thread_runner> (io_ctx, logger, rpc_config.rpc_process.io_threads, nano::thread_role::name::io_daemon);
 
 		try
 		{

nano/nano_wallet/entry.cpp

@@ -124,7 +124,7 @@ int run_wallet (QApplication & application, int argc, char * const * argv, std::
 
 		std::shared_ptr<boost::asio::io_context> io_ctx = std::make_shared<boost::asio::io_context> ();
 
-		nano::thread_runner runner (io_ctx, logger, config.node.io_threads);
+		nano::thread_runner runner (io_ctx, logger, config.node.io_threads, nano::thread_role::name::io_daemon);
 
 		std::shared_ptr<nano::node> node;
 		std::shared_ptr<nano_qt::wallet> gui;

nano/node/vote_cache.cpp

@@ -276,21 +276,8 @@ std::unique_ptr<nano::container_info_component> nano::vote_cache::collect_contai
 {
 	nano::lock_guard<nano::mutex> guard{ mutex };
 
-	auto count_unique_votes = [this] () {
-		std::unordered_set<std::shared_ptr<nano::vote>> votes;
-		for (auto const & entry : cache)
-		{
-			for (auto const & vote : entry.votes ())
-			{
-				votes.insert (vote);
-			}
-		}
-		return votes.size ();
-	};
-
 	auto composite = std::make_unique<container_info_composite> (name);
 	composite->add_component (std::make_unique<container_info_leaf> (container_info{ "cache", cache.size (), sizeof (ordered_cache::value_type) }));
-	composite->add_component (std::make_unique<container_info_leaf> (container_info{ "unique", count_unique_votes (), sizeof (nano::vote) }));
 	return composite;
 }