diff options
author | Shauren <shauren.trinity@gmail.com> | 2024-12-09 21:13:18 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2024-12-09 21:13:18 +0100 |
commit | c81183a6600722f3a9bb4996c0849b530fbdd1b0 (patch) | |
tree | 676a1c7ee6b6109ea70ddab9b5b11ab898757df5 /src/common | |
parent | bf0fe871948d196afcfe0c271c225fa3834e32fc (diff) |
Dep: Replace basic_deadline_timer with std::chrono based basic_waitable_timer
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/Asio/DeadlineTimer.h | 19 | ||||
-rw-r--r-- | src/common/Asio/Resolver.h | 1 | ||||
-rw-r--r-- | src/common/Metric/Metric.cpp | 4 |
3 files changed, 12 insertions, 12 deletions
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 <boost/asio/deadline_timer.hpp> +#include "Duration.h" +#include <boost/asio/basic_waitable_timer.hpp> +#include <boost/asio/io_context.hpp> -namespace Trinity +namespace Trinity::Asio { - namespace Asio - { - class DeadlineTimer : public boost::asio::basic_deadline_timer<boost::posix_time::ptime, boost::asio::time_traits<boost::posix_time::ptime>, boost::asio::io_context::executor_type> - { - public: - using basic_deadline_timer::basic_deadline_timer; - }; - } +class DeadlineTimer : public boost::asio::basic_waitable_timer<std::chrono::steady_clock, boost::asio::wait_traits<std::chrono::steady_clock>, boost::asio::io_context::executor_type> +{ +public: + using basic_waitable_timer::basic_waitable_timer; +}; } #endif // DeadlineTimer_h__ diff --git a/src/common/Asio/Resolver.h b/src/common/Asio/Resolver.h index 01fd3127abe..84dedd21bfa 100644 --- a/src/common/Asio/Resolver.h +++ b/src/common/Asio/Resolver.h @@ -21,6 +21,7 @@ #include "IoContext.h" #include "Optional.h" #include <boost/asio/ip/tcp.hpp> +#include <algorithm> #include <string_view> #include <vector> diff --git a/src/common/Metric/Metric.cpp b/src/common/Metric/Metric.cpp index e4bc948a8fa..a3956209b08 100644 --- a/src/common/Metric/Metric.cpp +++ b/src/common/Metric/Metric.cpp @@ -225,7 +225,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([this](boost::system::error_code const&){ SendBatch(); }); } else @@ -255,7 +255,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; |