Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Constexpr check NANO_ASIO_HANDLER_TRACKING #4562

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Constexpr check NANO_ASIO_HANDLER_TRACKING #4562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions nano/lib/thread_runner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ nano::thread_runner::thread_runner (std::shared_ptr<boost::asio::io_context> io_
try
{
logger.debug (nano::log::type::thread_runner, "Thread #{} ({}) started", i, to_string (role));
run (*io_ctx);
run ();
logger.debug (nano::log::type::thread_runner, "Thread #{} ({}) stopped", i, to_string (role));
}
catch (std::exception const & ex)
Expand All @@ -49,28 +49,30 @@ nano::thread_runner::~thread_runner ()
join ();
}

void nano::thread_runner::run (boost::asio::io_context & io_ctx_a)
void nano::thread_runner::run ()
{
#if NANO_ASIO_HANDLER_TRACKING == 0
io_ctx_a.run ();
#else
nano::timer<> timer;
timer.start ();
while (true)
if constexpr (nano::asio_handler_tracking_threshold () == 0)
{
timer.restart ();
// Run at most 1 completion handler and record the time it took to complete (non-blocking)
auto count = io_ctx_a.poll_one ();
if (count == 1 && timer.since_start ().count () >= NANO_ASIO_HANDLER_TRACKING)
io_ctx->run ();
}
else
{
nano::timer<> timer;
timer.start ();
while (true)
{
auto timestamp = std::chrono::duration_cast<std::chrono::microseconds> (std::chrono::system_clock::now ().time_since_epoch ()).count ();
std::cout << (boost::format ("[%1%] io_thread held for %2%ms") % timestamp % timer.since_start ().count ()).str () << std::endl;
timer.restart ();
// Run at most 1 completion handler and record the time it took to complete (non-blocking)
auto count = io_ctx->poll_one ();
if (count == 1 && timer.since_start ().count () >= nano::asio_handler_tracking_threshold ())
{
logger.warn (nano::log::type::system, "Async handler processing took too long: {}ms", timer.since_start ().count ());
}
// Sleep for a bit to give more time slices to other threads
std::this_thread::sleep_for (std::chrono::milliseconds (5));
std::this_thread::yield ();
}
// Sleep for a bit to give more time slices to other threads
std::this_thread::sleep_for (std::chrono::milliseconds (5));
std::this_thread::yield ();
}
#endif
}

void nano::thread_runner::join ()
Expand Down
11 changes: 10 additions & 1 deletion nano/lib/thread_runner.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ class thread_runner final
std::vector<boost::thread> threads;

private:
void run (boost::asio::io_context &);
void run ();
};

constexpr unsigned asio_handler_tracking_threshold ()
{
#if NANO_ASIO_HANDLER_TRACKING == 0
return 0;
#else
return NANO_ASIO_HANDLER_TRACKING;
#endif
}
} // namespace nano
27 changes: 15 additions & 12 deletions nano/test_common/system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <nano/crypto_lib/random_pool.hpp>
#include <nano/lib/blocks.hpp>
#include <nano/lib/thread_runner.hpp>
#include <nano/node/active_transactions.hpp>
#include <nano/node/common.hpp>
#include <nano/node/transport/tcp_listener.hpp>
Expand Down Expand Up @@ -335,22 +336,24 @@ void nano::test::system::deadline_set (std::chrono::duration<double, std::nano>

std::error_code nano::test::system::poll (std::chrono::nanoseconds const & wait_time)
{
#if NANO_ASIO_HANDLER_TRACKING == 0
io_ctx->run_one_for (wait_time);
#else
nano::timer<> timer;
timer.start ();
auto count = io_ctx.poll_one ();
if (count == 0)
if constexpr (nano::asio_handler_tracking_threshold () == 0)
{
std::this_thread::sleep_for (wait_time);
io_ctx->run_one_for (wait_time);
}
else if (count == 1 && timer.since_start ().count () >= NANO_ASIO_HANDLER_TRACKING)
else
{
auto timestamp = std::chrono::duration_cast<std::chrono::microseconds> (std::chrono::system_clock::now ().time_since_epoch ()).count ();
std::cout << (boost::format ("[%1%] io_thread held for %2%ms") % timestamp % timer.since_start ().count ()).str () << std::endl;
nano::timer<> timer;
timer.start ();
auto count = io_ctx->poll_one ();
if (count == 0)
{
std::this_thread::sleep_for (wait_time);
}
else if (count == 1 && timer.since_start ().count () >= nano::asio_handler_tracking_threshold ())
{
logger.warn (nano::log::type::system, "Async handler processing took too long: {}ms", timer.since_start ().count ());
}
}
#endif

std::error_code ec;
if (std::chrono::steady_clock::now () > deadline)
Expand Down
Loading