From 63692b2de3d3063cb4eafbb40501e6c8b9878943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?= <3044353+pwojcikdev@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:08:25 +0100 Subject: [PATCH] Remove unused ascending boostrap events --- nano/node/bootstrap_ascending/service.cpp | 26 ---------- nano/node/bootstrap_ascending/service.hpp | 5 -- nano/slow_test/bootstrap.cpp | 60 ----------------------- 3 files changed, 91 deletions(-) diff --git a/nano/node/bootstrap_ascending/service.cpp b/nano/node/bootstrap_ascending/service.cpp index b3bfc41db..221eeaddf 100644 --- a/nano/node/bootstrap_ascending/service.cpp +++ b/nano/node/bootstrap_ascending/service.cpp @@ -148,8 +148,6 @@ bool nano::bootstrap_ascending::service::send (std::shared_ptr ().insert (tag); } - on_request.notify (tag, channel); - nano::asc_pull_req request{ network_constants }; request.id = tag.id; @@ -299,7 +297,6 @@ void nano::bootstrap_ascending::service::inspect (secure::transaction const & tx void nano::bootstrap_ascending::service::wait (std::function const & predicate) const { std::unique_lock lock{ mutex }; - std::chrono::milliseconds interval = 5ms; while (!stopped && !predicate ()) { @@ -326,13 +323,11 @@ void nano::bootstrap_ascending::service::wait_blockprocessor () const std::shared_ptr nano::bootstrap_ascending::service::wait_channel () { std::shared_ptr channel; - wait ([this, &channel] () { debug_assert (!mutex.try_lock ()); channel = scoring.channel (); return channel != nullptr; // Wait until a channel is available }); - return channel; } @@ -357,15 +352,12 @@ std::pair nano::bootstrap_ascending::service::next_priori auto account = accounts.next_priority ([this] (nano::account const & account) { return count_tags (account, query_source::priority) < 4; }); - if (account.is_zero ()) { return {}; } - stats.inc (nano::stat::type::bootstrap_ascending_next, nano::stat::detail::next_priority); accounts.timestamp_set (account); - // TODO: Priority could be returned by the accounts.next_priority() call return { account, accounts.priority (account) }; } @@ -373,7 +365,6 @@ std::pair nano::bootstrap_ascending::service::next_priori std::pair nano::bootstrap_ascending::service::wait_priority () { std::pair result{ 0, 0 }; - wait ([this, &result] () { debug_assert (!mutex.try_lock ()); result = next_priority (); @@ -383,7 +374,6 @@ std::pair nano::bootstrap_ascending::service::wait_priori } return false; }); - return result; } @@ -397,16 +387,13 @@ nano::account nano::bootstrap_ascending::service::next_database (bool should_thr { return { 0 }; } - auto account = database_scan.next ([this] (nano::account const & account) { return count_tags (account, query_source::database) == 0; }); - if (account.is_zero ()) { return { 0 }; } - stats.inc (nano::stat::type::bootstrap_ascending_next, nano::stat::detail::next_database); return account; } @@ -414,7 +401,6 @@ nano::account nano::bootstrap_ascending::service::next_database (bool should_thr nano::account nano::bootstrap_ascending::service::wait_database (bool should_throttle) { nano::account result{ 0 }; - wait ([this, &result, should_throttle] () { debug_assert (!mutex.try_lock ()); result = next_database (should_throttle); @@ -424,7 +410,6 @@ nano::account nano::bootstrap_ascending::service::wait_database (bool should_thr } return false; }); - return result; } @@ -435,12 +420,10 @@ nano::block_hash nano::bootstrap_ascending::service::next_blocking () auto blocking = accounts.next_blocking ([this] (nano::block_hash const & hash) { return count_tags (hash, query_source::blocking) == 0; }); - if (blocking.is_zero ()) { return { 0 }; } - stats.inc (nano::stat::type::bootstrap_ascending_next, nano::stat::detail::next_blocking); return blocking; } @@ -448,7 +431,6 @@ nano::block_hash nano::bootstrap_ascending::service::next_blocking () nano::block_hash nano::bootstrap_ascending::service::wait_blocking () { nano::block_hash result{ 0 }; - wait ([this, &result] () { debug_assert (!mutex.try_lock ()); result = next_blocking (); @@ -458,14 +440,12 @@ nano::block_hash nano::bootstrap_ascending::service::wait_blocking () } return false; }); - return result; } nano::account nano::bootstrap_ascending::service::wait_frontier () { nano::account result{ 0 }; - wait ([this, &result] () { debug_assert (!mutex.try_lock ()); result = frontiers.next (); @@ -476,7 +456,6 @@ nano::account nano::bootstrap_ascending::service::wait_frontier () } return false; }); - return result; } @@ -539,7 +518,6 @@ bool nano::bootstrap_ascending::service::request_info (nano::block_hash hash, st tag.source = source; tag.start = hash; tag.hash = hash; - return send (channel, tag); } @@ -549,7 +527,6 @@ bool nano::bootstrap_ascending::service::request_frontiers (nano::account start, tag.type = query_type::frontiers; tag.source = source; tag.start = start; - return send (channel, tag); } @@ -700,7 +677,6 @@ void nano::bootstrap_ascending::service::cleanup_and_sync () { auto tag = tags_by_order.front (); tags_by_order.pop_front (); - on_timeout.notify (tag); stats.inc (nano::stat::type::bootstrap_ascending, nano::stat::detail::timeout); } @@ -777,8 +753,6 @@ void nano::bootstrap_ascending::service::process (nano::asc_pull_ack const & mes lock.unlock (); - on_reply.notify (tag); - // Process the response payload std::visit ([this, &tag] (auto && request) { return process (request, tag); }, message.payload); diff --git a/nano/node/bootstrap_ascending/service.hpp b/nano/node/bootstrap_ascending/service.hpp index 2379b9594..6fef34ff0 100644 --- a/nano/node/bootstrap_ascending/service.hpp +++ b/nano/node/bootstrap_ascending/service.hpp @@ -94,11 +94,6 @@ namespace bootstrap_ascending std::chrono::steady_clock::time_point timestamp{ std::chrono::steady_clock::now () }; }; - public: // Events - nano::observer_set const &> on_request; - nano::observer_set on_reply; - nano::observer_set on_timeout; - private: /* Inspects a block that has been processed by the block processor */ void inspect (secure::transaction const &, nano::block_status const & result, nano::block const & block, nano::block_source); diff --git a/nano/slow_test/bootstrap.cpp b/nano/slow_test/bootstrap.cpp index 521bff885..f4c035f1f 100644 --- a/nano/slow_test/bootstrap.cpp +++ b/nano/slow_test/bootstrap.cpp @@ -107,67 +107,7 @@ TEST (bootstrap_ascending, profile) auto client_rpc = start_rpc (system, *server, 55000); auto server_rpc = start_rpc (system, *client, 55001); - struct entry - { - nano::bootstrap_ascending::service::async_tag tag; - std::shared_ptr request_channel; - std::shared_ptr reply_channel; - - bool replied{ false }; - bool received{ false }; - }; - nano::mutex mutex; - std::unordered_map requests; - - server->bootstrap_server.on_response.add ([&] (auto & response, auto & channel) { - nano::lock_guard lock{ mutex }; - - if (requests.count (response.id)) - { - requests[response.id].replied = true; - requests[response.id].reply_channel = channel; - } - else - { - std::cerr << "unknown response: " << response.id << std::endl; - } - }); - - client->ascendboot.on_request.add ([&] (auto & tag, auto & channel) { - nano::lock_guard lock{ mutex }; - - requests[tag.id] = { tag, channel }; - }); - - client->ascendboot.on_reply.add ([&] (auto & tag) { - nano::lock_guard lock{ mutex }; - - requests[tag.id].received = true; - }); - - /*client->ascendboot.on_timeout.add ([&] (auto & tag) { - nano::lock_guard lock{ mutex }; - - if (requests.count (tag.id)) - { - auto entry = requests[tag.id]; - - std::cerr << "timeout: " - << "replied: " << entry.replied - << " | " - << "recevied: " << entry.received - << " | " - << "request: " << entry.request_channel->to_string () - << " ||| " - << "reply: " << (entry.reply_channel ? entry.reply_channel->to_string () : "null") - << std::endl; - } - else - { - std::cerr << "unknown timeout: " << tag.id << std::endl; - } - });*/ std::cout << "server count: " << server->ledger.block_count () << std::endl;