diff --git a/nano/lib/thread_roles.cpp b/nano/lib/thread_roles.cpp index b5198d3cd2..0824d23733 100644 --- a/nano/lib/thread_roles.cpp +++ b/nano/lib/thread_roles.cpp @@ -70,18 +70,12 @@ std::string nano::thread_role::get_string (nano::thread_role::name role) case nano::thread_role::name::db_parallel_traversal: thread_role_name_string = "DB par traversl"; break; - case nano::thread_role::name::election_scheduler: - thread_role_name_string = "Election Sched"; - break; case nano::thread_role::name::unchecked: thread_role_name_string = "Unchecked"; break; case nano::thread_role::name::backlog_population: thread_role_name_string = "Backlog"; break; - case nano::thread_role::name::election_hinting: - thread_role_name_string = "Hinting"; - break; case nano::thread_role::name::vote_generator_queue: thread_role_name_string = "Voting que"; break; @@ -94,8 +88,17 @@ std::string nano::thread_role::get_string (nano::thread_role::name role) case nano::thread_role::name::telemetry: thread_role_name_string = "Telemetry"; break; - case nano::thread_role::name::optimistic_scheduler: - thread_role_name_string = "Optimistic"; + case nano::thread_role::name::scheduler_hinted: + thread_role_name_string = "Sched Hinted"; + break; + case nano::thread_role::name::scheduler_manual: + thread_role_name_string = "Sched Manual"; + break; + case nano::thread_role::name::scheduler_optimistic: + thread_role_name_string = "Sched Opt"; + break; + case nano::thread_role::name::scheduler_priority: + thread_role_name_string = "Sched Priority"; break; default: debug_assert (false && "nano::thread_role::get_string unhandled thread role"); @@ -133,4 +136,4 @@ void nano::thread_role::set (nano::thread_role::name role) nano::thread_role::set_os_name (thread_role_name_string); current_thread_role = role; -} \ No newline at end of file +} diff --git a/nano/lib/thread_roles.hpp b/nano/lib/thread_roles.hpp index e5552fdc73..311ae58d1b 100644 --- a/nano/lib/thread_roles.hpp +++ b/nano/lib/thread_roles.hpp @@ -30,17 +30,18 @@ enum class name state_block_signature_verification, epoch_upgrader, db_parallel_traversal, - election_scheduler, unchecked, backlog_population, - election_hinting, vote_generator_queue, bootstrap_server, telemetry, - optimistic_scheduler, ascending_bootstrap, bootstrap_server_requests, bootstrap_server_responses, + scheduler_hinted, + scheduler_manual, + scheduler_optimistic, + scheduler_priority, }; /* @@ -63,4 +64,4 @@ std::string get_string (); * Internal only, should not be called directly */ void set_os_name (std::string const &); -} \ No newline at end of file +} diff --git a/nano/node/scheduler/hinted.cpp b/nano/node/scheduler/hinted.cpp index ba8ec51e10..6c5d4933bd 100644 --- a/nano/node/scheduler/hinted.cpp +++ b/nano/node/scheduler/hinted.cpp @@ -28,7 +28,7 @@ void nano::scheduler::hinted::start () debug_assert (!thread.joinable ()); thread = std::thread{ [this] () { - nano::thread_role::set (nano::thread_role::name::election_hinting); + nano::thread_role::set (nano::thread_role::name::scheduler_hinted); run (); } }; } diff --git a/nano/node/scheduler/manual.cpp b/nano/node/scheduler/manual.cpp index 82ce43debb..d409824559 100644 --- a/nano/node/scheduler/manual.cpp +++ b/nano/node/scheduler/manual.cpp @@ -17,7 +17,7 @@ void nano::scheduler::manual::start () debug_assert (!thread.joinable ()); thread = std::thread{ [this] () { - nano::thread_role::set (nano::thread_role::name::election_scheduler); + nano::thread_role::set (nano::thread_role::name::scheduler_manual); run (); } }; } diff --git a/nano/node/scheduler/optimistic.cpp b/nano/node/scheduler/optimistic.cpp index beb7d3353a..a00fa4d96c 100644 --- a/nano/node/scheduler/optimistic.cpp +++ b/nano/node/scheduler/optimistic.cpp @@ -29,7 +29,7 @@ void nano::scheduler::optimistic::start () debug_assert (!thread.joinable ()); thread = std::thread{ [this] () { - nano::thread_role::set (nano::thread_role::name::optimistic_scheduler); + nano::thread_role::set (nano::thread_role::name::scheduler_optimistic); run (); } }; } diff --git a/nano/node/scheduler/priority.cpp b/nano/node/scheduler/priority.cpp index 323a18c515..e4bd01392e 100644 --- a/nano/node/scheduler/priority.cpp +++ b/nano/node/scheduler/priority.cpp @@ -20,7 +20,7 @@ void nano::scheduler::priority::start () debug_assert (!thread.joinable ()); thread = std::thread{ [this] () { - nano::thread_role::set (nano::thread_role::name::election_scheduler); + nano::thread_role::set (nano::thread_role::name::scheduler_priority); run (); } }; }