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

Rename thread roles

Browse source
This commit is contained in:
Piotr Wójcik 2024-10-29 17:55:53 +01:00
commit a6832e7d24
3 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
nano/lib/thread_roles.cpp
View file

@ -73,9 +73,6 @@ std::string nano::thread_role::get_string (nano::thread_role::name role)
case nano::thread_role::name::worker: case nano::thread_role::name::worker:
thread_role_name_string = "Worker"; thread_role_name_string = "Worker";
break; break;
case nano::thread_role::name::bootstrap_worker:
thread_role_name_string = "Bootstrap work";
break;
case nano::thread_role::name::wallet_worker: case nano::thread_role::name::wallet_worker:
thread_role_name_string = "Wallet work"; thread_role_name_string = "Wallet work";
break; break;
@ -103,11 +100,23 @@ std::string nano::thread_role::get_string (nano::thread_role::name role)
case nano::thread_role::name::vote_generator_queue: case nano::thread_role::name::vote_generator_queue:
thread_role_name_string = "Voting que"; thread_role_name_string = "Voting que";
break; break;
case nano::thread_role::name::ascending_bootstrap: case nano::thread_role::name::bootstrap:
thread_role_name_string = "Ascboot"; thread_role_name_string = "Bootstrap";
break; break;
case nano::thread_role::name::ascending_bootstrap_worker: case nano::thread_role::name::bootstrap_database_scan:
thread_role_name_string = "Ascboot work"; thread_role_name_string = "Bootstrap db";
break;
case nano::thread_role::name::bootstrap_dependendy_walker:
thread_role_name_string = "Bootstrap walkr";
break;
case nano::thread_role::name::bootstrap_frontier_scan:
thread_role_name_string = "Bootstrap front";
break;
case nano::thread_role::name::bootstrap_cleanup:
thread_role_name_string = "Bootstrap clean";
break;
case nano::thread_role::name::bootstrap_worker:
thread_role_name_string = "Bootstrap work";
break; break;
case nano::thread_role::name::bootstrap_server: case nano::thread_role::name::bootstrap_server:
thread_role_name_string = "Bootstrap serv"; thread_role_name_string = "Bootstrap serv";

13
nano/lib/thread_roles.hpp
View file

@ -29,7 +29,6 @@ enum class name
confirmation_height, confirmation_height,
confirmation_height_notifications, confirmation_height_notifications,
worker, worker,
bootstrap_worker,
wallet_worker, wallet_worker,
election_worker, election_worker,
request_aggregator, request_aggregator,
@ -39,12 +38,14 @@ enum class name
unchecked, unchecked,
backlog_population, backlog_population,
vote_generator_queue, vote_generator_queue,
bootstrap_server,
telemetry, telemetry,
ascending_bootstrap, bootstrap,
ascending_bootstrap_worker, bootstrap_database_scan,
bootstrap_server_requests, bootstrap_dependendy_walker,
bootstrap_server_responses, bootstrap_frontier_scan,
bootstrap_cleanup,
bootstrap_worker,
bootstrap_server,
scheduler_hinted, scheduler_hinted,
scheduler_manual, scheduler_manual,
scheduler_optimistic, scheduler_optimistic,

12
nano/node/bootstrap/bootstrap_service.cpp
View file

@ -32,7 +32,7 @@ nano::bootstrap_service::bootstrap_service (nano::node_config const & node_confi
scoring{ config, node_config_a.network_params.network }, scoring{ config, node_config_a.network_params.network },
database_limiter{ config.database_rate_limit }, database_limiter{ config.database_rate_limit },
frontiers_limiter{ config.frontier_rate_limit }, frontiers_limiter{ config.frontier_rate_limit },
workers{ 1, nano::thread_role::name::ascending_bootstrap_worker } workers{ 1, nano::thread_role::name::bootstrap_worker }
{ {
block_processor.batch_processed.add ([this] (auto const & batch) { block_processor.batch_processed.add ([this] (auto const & batch) {
{ {
@ -81,7 +81,7 @@ void nano::bootstrap_service::start ()
if (config.enable_scan) if (config.enable_scan)
{ {
priorities_thread = std::thread ([this] () { priorities_thread = std::thread ([this] () {
nano::thread_role::set (nano::thread_role::name::ascending_bootstrap); nano::thread_role::set (nano::thread_role::name::bootstrap);
run_priorities (); run_priorities ();
}); });
} }
@ -89,7 +89,7 @@ void nano::bootstrap_service::start ()
if (config.enable_database_scan) if (config.enable_database_scan)
{ {
database_thread = std::thread ([this] () { database_thread = std::thread ([this] () {
nano::thread_role::set (nano::thread_role::name::ascending_bootstrap); nano::thread_role::set (nano::thread_role::name::bootstrap_database_scan);
run_database (); run_database ();
}); });
} }
@ -97,7 +97,7 @@ void nano::bootstrap_service::start ()
if (config.enable_dependency_walker) if (config.enable_dependency_walker)
{ {
dependencies_thread = std::thread ([this] () { dependencies_thread = std::thread ([this] () {
nano::thread_role::set (nano::thread_role::name::ascending_bootstrap); nano::thread_role::set (nano::thread_role::name::bootstrap_dependendy_walker);
run_dependencies (); run_dependencies ();
}); });
} }
@ -105,13 +105,13 @@ void nano::bootstrap_service::start ()
if (config.enable_frontier_scan) if (config.enable_frontier_scan)
{ {
frontiers_thread = std::thread ([this] () { frontiers_thread = std::thread ([this] () {
nano::thread_role::set (nano::thread_role::name::ascending_bootstrap); nano::thread_role::set (nano::thread_role::name::bootstrap_frontier_scan);
run_frontiers (); run_frontiers ();
}); });
} }
timeout_thread = std::thread ([this] () { timeout_thread = std::thread ([this] () {
nano::thread_role::set (nano::thread_role::name::ascending_bootstrap); nano::thread_role::set (nano::thread_role::name::bootstrap_cleanup);
run_timeouts (); run_timeouts ();
}); });
} }