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

Remove unused ascending boostrap events

Browse source
This commit is contained in:
Piotr Wójcik 2024-10-29 10:08:25 +01:00
commit 63692b2de3
3 changed files with 0 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

26
nano/node/bootstrap_ascending/service.cpp
View file

@ -148,8 +148,6 @@ bool nano::bootstrap_ascending::service::send (std::shared_ptr<nano::transport::
tags.get<tag_id> ().insert (tag); tags.get<tag_id> ().insert (tag);
} }
on_request.notify (tag, channel);
nano::asc_pull_req request{ network_constants }; nano::asc_pull_req request{ network_constants };
request.id = tag.id; 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<bool ()> const & predicate) const void nano::bootstrap_ascending::service::wait (std::function<bool ()> const & predicate) const
{ {
std::unique_lock<nano::mutex> lock{ mutex }; std::unique_lock<nano::mutex> lock{ mutex };
std::chrono::milliseconds interval = 5ms; std::chrono::milliseconds interval = 5ms;
while (!stopped && !predicate ()) while (!stopped && !predicate ())
{ {
@ -326,13 +323,11 @@ void nano::bootstrap_ascending::service::wait_blockprocessor () const
std::shared_ptr<nano::transport::channel> nano::bootstrap_ascending::service::wait_channel () std::shared_ptr<nano::transport::channel> nano::bootstrap_ascending::service::wait_channel ()
{ {
std::shared_ptr<nano::transport::channel> channel; std::shared_ptr<nano::transport::channel> channel;
wait ([this, &channel] () { wait ([this, &channel] () {
debug_assert (!mutex.try_lock ()); debug_assert (!mutex.try_lock ());
channel = scoring.channel (); channel = scoring.channel ();
return channel != nullptr; // Wait until a channel is available return channel != nullptr; // Wait until a channel is available
}); });
return channel; return channel;
} }
@ -357,15 +352,12 @@ std::pair<nano::account, double> nano::bootstrap_ascending::service::next_priori
auto account = accounts.next_priority ([this] (nano::account const & account) { auto account = accounts.next_priority ([this] (nano::account const & account) {
return count_tags (account, query_source::priority) < 4; return count_tags (account, query_source::priority) < 4;
}); });
if (account.is_zero ()) if (account.is_zero ())
{ {
return {}; return {};
} }
stats.inc (nano::stat::type::bootstrap_ascending_next, nano::stat::detail::next_priority); stats.inc (nano::stat::type::bootstrap_ascending_next, nano::stat::detail::next_priority);
accounts.timestamp_set (account); accounts.timestamp_set (account);
// TODO: Priority could be returned by the accounts.next_priority() call // TODO: Priority could be returned by the accounts.next_priority() call
return { account, accounts.priority (account) }; return { account, accounts.priority (account) };
} }
@ -373,7 +365,6 @@ std::pair<nano::account, double> nano::bootstrap_ascending::service::next_priori
std::pair<nano::account, double> nano::bootstrap_ascending::service::wait_priority () std::pair<nano::account, double> nano::bootstrap_ascending::service::wait_priority ()
{ {
std::pair<nano::account, double> result{ 0, 0 }; std::pair<nano::account, double> result{ 0, 0 };
wait ([this, &result] () { wait ([this, &result] () {
debug_assert (!mutex.try_lock ()); debug_assert (!mutex.try_lock ());
result = next_priority (); result = next_priority ();
@ -383,7 +374,6 @@ std::pair<nano::account, double> nano::bootstrap_ascending::service::wait_priori
} }
return false; return false;
}); });
return result; return result;
} }
@ -397,16 +387,13 @@ nano::account nano::bootstrap_ascending::service::next_database (bool should_thr
{ {
return { 0 }; return { 0 };
} }
auto account = database_scan.next ([this] (nano::account const & account) { auto account = database_scan.next ([this] (nano::account const & account) {
return count_tags (account, query_source::database) == 0; return count_tags (account, query_source::database) == 0;
}); });
if (account.is_zero ()) if (account.is_zero ())
{ {
return { 0 }; return { 0 };
} }
stats.inc (nano::stat::type::bootstrap_ascending_next, nano::stat::detail::next_database); stats.inc (nano::stat::type::bootstrap_ascending_next, nano::stat::detail::next_database);
return account; 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 nano::bootstrap_ascending::service::wait_database (bool should_throttle)
{ {
nano::account result{ 0 }; nano::account result{ 0 };
wait ([this, &result, should_throttle] () { wait ([this, &result, should_throttle] () {
debug_assert (!mutex.try_lock ()); debug_assert (!mutex.try_lock ());
result = next_database (should_throttle); result = next_database (should_throttle);
@ -424,7 +410,6 @@ nano::account nano::bootstrap_ascending::service::wait_database (bool should_thr
} }
return false; return false;
}); });
return result; 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) { auto blocking = accounts.next_blocking ([this] (nano::block_hash const & hash) {
return count_tags (hash, query_source::blocking) == 0; return count_tags (hash, query_source::blocking) == 0;
}); });
if (blocking.is_zero ()) if (blocking.is_zero ())
{ {
return { 0 }; return { 0 };
} }
stats.inc (nano::stat::type::bootstrap_ascending_next, nano::stat::detail::next_blocking); stats.inc (nano::stat::type::bootstrap_ascending_next, nano::stat::detail::next_blocking);
return 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 nano::bootstrap_ascending::service::wait_blocking ()
{ {
nano::block_hash result{ 0 }; nano::block_hash result{ 0 };
wait ([this, &result] () { wait ([this, &result] () {
debug_assert (!mutex.try_lock ()); debug_assert (!mutex.try_lock ());
result = next_blocking (); result = next_blocking ();
@ -458,14 +440,12 @@ nano::block_hash nano::bootstrap_ascending::service::wait_blocking ()
} }
return false; return false;
}); });
return result; return result;
} }
nano::account nano::bootstrap_ascending::service::wait_frontier () nano::account nano::bootstrap_ascending::service::wait_frontier ()
{ {
nano::account result{ 0 }; nano::account result{ 0 };
wait ([this, &result] () { wait ([this, &result] () {
debug_assert (!mutex.try_lock ()); debug_assert (!mutex.try_lock ());
result = frontiers.next (); result = frontiers.next ();
@ -476,7 +456,6 @@ nano::account nano::bootstrap_ascending::service::wait_frontier ()
} }
return false; return false;
}); });
return result; return result;
} }
@ -539,7 +518,6 @@ bool nano::bootstrap_ascending::service::request_info (nano::block_hash hash, st
tag.source = source; tag.source = source;
tag.start = hash; tag.start = hash;
tag.hash = hash; tag.hash = hash;
return send (channel, tag); return send (channel, tag);
} }
@ -549,7 +527,6 @@ bool nano::bootstrap_ascending::service::request_frontiers (nano::account start,
tag.type = query_type::frontiers; tag.type = query_type::frontiers;
tag.source = source; tag.source = source;
tag.start = start; tag.start = start;
return send (channel, tag); return send (channel, tag);
} }
@ -700,7 +677,6 @@ void nano::bootstrap_ascending::service::cleanup_and_sync ()
{ {
auto tag = tags_by_order.front (); auto tag = tags_by_order.front ();
tags_by_order.pop_front (); tags_by_order.pop_front ();
on_timeout.notify (tag);
stats.inc (nano::stat::type::bootstrap_ascending, nano::stat::detail::timeout); 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 (); lock.unlock ();
on_reply.notify (tag);
// Process the response payload // Process the response payload
std::visit ([this, &tag] (auto && request) { return process (request, tag); }, message.payload); std::visit ([this, &tag] (auto && request) { return process (request, tag); }, message.payload);

5
nano/node/bootstrap_ascending/service.hpp
View file

@ -94,11 +94,6 @@ namespace bootstrap_ascending
std::chrono::steady_clock::time_point timestamp{ std::chrono::steady_clock::now () }; std::chrono::steady_clock::time_point timestamp{ std::chrono::steady_clock::now () };
}; };
public: // Events
nano::observer_set<async_tag const &, std::shared_ptr<nano::transport::channel> const &> on_request;
nano::observer_set<async_tag const &> on_reply;
nano::observer_set<async_tag const &> on_timeout;
private: private:
/* Inspects a block that has been processed by the block processor */ /* 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); void inspect (secure::transaction const &, nano::block_status const & result, nano::block const & block, nano::block_source);

60
nano/slow_test/bootstrap.cpp
View file

@ -107,67 +107,7 @@ TEST (bootstrap_ascending, profile)
auto client_rpc = start_rpc (system, *server, 55000); auto client_rpc = start_rpc (system, *server, 55000);
auto server_rpc = start_rpc (system, *client, 55001); auto server_rpc = start_rpc (system, *client, 55001);
struct entry
{
nano::bootstrap_ascending::service::async_tag tag;
std::shared_ptr<nano::transport::channel> request_channel;
std::shared_ptr<nano::transport::channel> reply_channel;
bool replied{ false };
bool received{ false };
};
nano::mutex mutex; nano::mutex mutex;
std::unordered_map<uint64_t, entry> requests;
server->bootstrap_server.on_response.add ([&] (auto & response, auto & channel) {
nano::lock_guard<nano::mutex> 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<nano::mutex> lock{ mutex };
requests[tag.id] = { tag, channel };
});
client->ascendboot.on_reply.add ([&] (auto & tag) {
nano::lock_guard<nano::mutex> lock{ mutex };
requests[tag.id].received = true;
});
/*client->ascendboot.on_timeout.add ([&] (auto & tag) {
nano::lock_guard<nano::mutex> 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; std::cout << "server count: " << server->ledger.block_count () << std::endl;