From 1942647c0d0229aca96602f3617365bd477e94de Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 9 Dec 2024 21:13:18 +0100 Subject: Dep: Replace basic_deadline_timer with std::chrono based basic_waitable_timer (cherry picked from commit c81183a6600722f3a9bb4996c0849b530fbdd1b0) --- src/common/Asio/DeadlineTimer.h | 19 +++++++++---------- src/common/Metric/Metric.cpp | 4 ++-- 2 files changed, 11 insertions(+), 12 deletions(-) (limited to 'src/common') diff --git a/src/common/Asio/DeadlineTimer.h b/src/common/Asio/DeadlineTimer.h index 94531a28511..c1b2306b257 100644 --- a/src/common/Asio/DeadlineTimer.h +++ b/src/common/Asio/DeadlineTimer.h @@ -18,18 +18,17 @@ #ifndef DeadlineTimer_h__ #define DeadlineTimer_h__ -#include +#include "Duration.h" +#include +#include -namespace Trinity +namespace Trinity::Asio { - namespace Asio - { - class DeadlineTimer : public boost::asio::basic_deadline_timer, boost::asio::io_context::executor_type> - { - public: - using basic_deadline_timer::basic_deadline_timer; - }; - } +class DeadlineTimer : public boost::asio::basic_waitable_timer, boost::asio::io_context::executor_type> +{ +public: + using basic_waitable_timer::basic_waitable_timer; +}; } #endif // DeadlineTimer_h__ diff --git a/src/common/Metric/Metric.cpp b/src/common/Metric/Metric.cpp index 06c084a3c2c..08dff35eb98 100644 --- a/src/common/Metric/Metric.cpp +++ b/src/common/Metric/Metric.cpp @@ -220,7 +220,7 @@ void Metric::ScheduleSend() { if (_enabled) { - _batchTimer->expires_from_now(boost::posix_time::seconds(_updateInterval)); + _batchTimer->expires_after(std::chrono::seconds(_updateInterval)); _batchTimer->async_wait(std::bind(&Metric::SendBatch, this)); } else @@ -250,7 +250,7 @@ void Metric::ScheduleOverallStatusLog() { if (_enabled) { - _overallStatusTimer->expires_from_now(boost::posix_time::seconds(_overallStatusTimerInterval)); + _overallStatusTimer->expires_after(std::chrono::seconds(_overallStatusTimerInterval)); _overallStatusTimer->async_wait([this](const boost::system::error_code&) { _overallStatusTimerTriggered = true; -- cgit v1.2.3