From 0bc70670d2eb129bc8629670420363089f9dded0 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Thu, 19 Dec 2024 18:00:03 +0100 Subject: [PATCH] refactor(Core/Misc): Use steady_timer instead of deadline_timer (#20940) --- src/common/Asio/DeadlineTimer.h | 34 -------------------- src/common/Asio/IoContext.h | 5 ++- src/common/Metric/Metric.cpp | 13 +++++--- src/common/Metric/Metric.h | 6 ++-- src/server/apps/authserver/Main.cpp | 39 ++++++++++++++--------- src/server/apps/worldserver/Main.cpp | 11 ++++--- src/server/shared/Network/NetworkThread.h | 10 +++--- src/server/shared/Realms/RealmList.cpp | 7 ++-- src/server/shared/Realms/RealmList.h | 18 +++++++---- 9 files changed, 65 insertions(+), 78 deletions(-) delete mode 100644 src/common/Asio/DeadlineTimer.h diff --git a/src/common/Asio/DeadlineTimer.h b/src/common/Asio/DeadlineTimer.h deleted file mode 100644 index 09e377e6d..000000000 --- a/src/common/Asio/DeadlineTimer.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by the - * Free Software Foundation; either version 3 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#ifndef DeadlineTimer_h__ -#define DeadlineTimer_h__ - -#include - -#define DeadlineTimerBase boost::asio::basic_deadline_timer, boost::asio::io_context::executor_type> - -namespace Acore::Asio -{ - class DeadlineTimer : public DeadlineTimerBase - { - public: - using DeadlineTimerBase::basic_deadline_timer; - }; -} - -#endif // DeadlineTimer_h__ diff --git a/src/common/Asio/IoContext.h b/src/common/Asio/IoContext.h index 46dfa8516..fa85c6715 100644 --- a/src/common/Asio/IoContext.h +++ b/src/common/Asio/IoContext.h @@ -19,7 +19,6 @@ #define IoContext_h__ #include - #include #include #define IoContextBaseNamespace boost::asio @@ -52,9 +51,9 @@ namespace Acore::Asio } template - inline decltype(auto) get_io_context(T&& ioObject) + inline boost::asio::io_context& get_io_context(T&& ioObject) { - return ioObject.get_executor().context(); + return static_cast(ioObject.get_executor().context()); } } diff --git a/src/common/Metric/Metric.cpp b/src/common/Metric/Metric.cpp index 8a2ecabd8..a6cd4b1f2 100644 --- a/src/common/Metric/Metric.cpp +++ b/src/common/Metric/Metric.cpp @@ -17,7 +17,6 @@ #include "Metric.h" #include "Config.h" -#include "DeadlineTimer.h" #include "Log.h" #include "Strand.h" #include "Tokenize.h" @@ -42,8 +41,8 @@ void Metric::Initialize(std::string const& realmName, Acore::Asio::IoContext& io { _dataStream = std::make_unique(); _realmName = FormatInfluxDBTagValue(realmName); - _batchTimer = std::make_unique(ioContext); - _overallStatusTimer = std::make_unique(ioContext); + _batchTimer = std::make_unique(ioContext); + _overallStatusTimer = std::make_unique(ioContext); _overallStatusLogger = overallStatusLogger; LoadFromConfigs(); } @@ -247,7 +246,9 @@ void Metric::ScheduleSend() { if (_enabled) { - _batchTimer->expires_from_now(boost::posix_time::seconds(_updateInterval)); + // Calculate the expiration time + auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(_updateInterval); + _batchTimer->expires_at(expirationTime); _batchTimer->async_wait(std::bind(&Metric::SendBatch, this)); } else @@ -280,7 +281,9 @@ void Metric::ScheduleOverallStatusLog() { if (_enabled) { - _overallStatusTimer->expires_from_now(boost::posix_time::seconds(_overallStatusTimerInterval)); + // Calculate the expiration time _overallStatusTimerInterval from now + auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(_overallStatusTimerInterval); + _overallStatusTimer->expires_at(expirationTime); _overallStatusTimer->async_wait([this](const boost::system::error_code&) { _overallStatusTimerTriggered = true; diff --git a/src/common/Metric/Metric.h b/src/common/Metric/Metric.h index eca14f52c..729d2f7fc 100644 --- a/src/common/Metric/Metric.h +++ b/src/common/Metric/Metric.h @@ -21,6 +21,7 @@ #include "Define.h" #include "Duration.h" #include "MPSCQueue.h" +#include #include #include // NOTE: this import is NEEDED (even though some IDEs report it as unused) #include @@ -30,7 +31,6 @@ namespace Acore::Asio { class IoContext; - class DeadlineTimer; } enum MetricDataType @@ -62,8 +62,8 @@ private: std::iostream& GetDataStream() { return *_dataStream; } std::unique_ptr _dataStream; MPSCQueue _queuedData; - std::unique_ptr _batchTimer; - std::unique_ptr _overallStatusTimer; + std::unique_ptr _batchTimer; + std::unique_ptr _overallStatusTimer; int32 _updateInterval = 0; int32 _overallStatusTimerInterval = 0; bool _enabled = false; diff --git a/src/server/apps/authserver/Main.cpp b/src/server/apps/authserver/Main.cpp index dd07cf0ae..6030d9114 100644 --- a/src/server/apps/authserver/Main.cpp +++ b/src/server/apps/authserver/Main.cpp @@ -29,7 +29,6 @@ #include "Config.h" #include "DatabaseEnv.h" #include "DatabaseLoader.h" -#include "DeadlineTimer.h" #include "IPLocation.h" #include "IoContext.h" #include "Log.h" @@ -60,8 +59,8 @@ namespace fs = std::filesystem; bool StartDB(); void StopDB(); void SignalHandler(std::weak_ptr ioContextRef, boost::system::error_code const& error, int signalNumber); -void KeepDatabaseAliveHandler(std::weak_ptr dbPingTimerRef, int32 dbPingInterval, boost::system::error_code const& error); -void BanExpiryHandler(std::weak_ptr banExpiryCheckTimerRef, int32 banExpiryCheckInterval, boost::system::error_code const& error); +void KeepDatabaseAliveHandler(std::weak_ptr dbPingTimerRef, int32 dbPingInterval, boost::system::error_code const& error); +void BanExpiryHandler(std::weak_ptr banExpiryCheckTimerRef, int32 banExpiryCheckInterval, boost::system::error_code const& error); variables_map GetConsoleArguments(int argc, char** argv, fs::path& configFile); /// Launch the auth server @@ -178,14 +177,20 @@ int main(int argc, char** argv) // Enabled a timed callback for handling the database keep alive ping int32 dbPingInterval = sConfigMgr->GetOption("MaxPingTime", 30); - std::shared_ptr dbPingTimer = std::make_shared(*ioContext); - dbPingTimer->expires_from_now(boost::posix_time::minutes(dbPingInterval)); - dbPingTimer->async_wait(std::bind(&KeepDatabaseAliveHandler, std::weak_ptr(dbPingTimer), dbPingInterval, std::placeholders::_1)); + std::shared_ptr dbPingTimer = std::make_shared(*ioContext); + + // Calculate the expiration time + auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(dbPingInterval); + dbPingTimer->expires_at(expirationTime); + dbPingTimer->async_wait(std::bind(&KeepDatabaseAliveHandler, std::weak_ptr(dbPingTimer), dbPingInterval, std::placeholders::_1)); int32 banExpiryCheckInterval = sConfigMgr->GetOption("BanExpiryCheckInterval", 60); - std::shared_ptr banExpiryCheckTimer = std::make_shared(*ioContext); - banExpiryCheckTimer->expires_from_now(boost::posix_time::seconds(banExpiryCheckInterval)); - banExpiryCheckTimer->async_wait(std::bind(&BanExpiryHandler, std::weak_ptr(banExpiryCheckTimer), banExpiryCheckInterval, std::placeholders::_1)); + std::shared_ptr banExpiryCheckTimer = std::make_shared(*ioContext); + + // Calculate the expiration time + auto expirationTimeBanExpiry = std::chrono::steady_clock::now() + std::chrono::seconds(banExpiryCheckInterval); + banExpiryCheckTimer->expires_at(expirationTimeBanExpiry); + banExpiryCheckTimer->async_wait(std::bind(&BanExpiryHandler, std::weak_ptr(banExpiryCheckTimer), banExpiryCheckInterval, std::placeholders::_1)); // Start the io service worker loop ioContext->run(); @@ -238,31 +243,35 @@ void SignalHandler(std::weak_ptr ioContextRef, boost::sy } } -void KeepDatabaseAliveHandler(std::weak_ptr dbPingTimerRef, int32 dbPingInterval, boost::system::error_code const& error) +void KeepDatabaseAliveHandler(std::weak_ptr dbPingTimerRef, int32 dbPingInterval, boost::system::error_code const& error) { if (!error) { - if (std::shared_ptr dbPingTimer = dbPingTimerRef.lock()) + if (std::shared_ptr dbPingTimer = dbPingTimerRef.lock()) { LOG_INFO("server.authserver", "Ping MySQL to keep connection alive"); LoginDatabase.KeepAlive(); - dbPingTimer->expires_from_now(boost::posix_time::minutes(dbPingInterval)); + // Calculate the expiration time + auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(dbPingInterval); + dbPingTimer->expires_at(expirationTime); dbPingTimer->async_wait(std::bind(&KeepDatabaseAliveHandler, dbPingTimerRef, dbPingInterval, std::placeholders::_1)); } } } -void BanExpiryHandler(std::weak_ptr banExpiryCheckTimerRef, int32 banExpiryCheckInterval, boost::system::error_code const& error) +void BanExpiryHandler(std::weak_ptr banExpiryCheckTimerRef, int32 banExpiryCheckInterval, boost::system::error_code const& error) { if (!error) { - if (std::shared_ptr banExpiryCheckTimer = banExpiryCheckTimerRef.lock()) + if (std::shared_ptr banExpiryCheckTimer = banExpiryCheckTimerRef.lock()) { LoginDatabase.Execute(LoginDatabase.GetPreparedStatement(LOGIN_DEL_EXPIRED_IP_BANS)); LoginDatabase.Execute(LoginDatabase.GetPreparedStatement(LOGIN_UPD_EXPIRED_ACCOUNT_BANS)); - banExpiryCheckTimer->expires_from_now(boost::posix_time::seconds(banExpiryCheckInterval)); + // Calculate the expiration time + auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(banExpiryCheckInterval); + banExpiryCheckTimer->expires_at(expirationTime); banExpiryCheckTimer->async_wait(std::bind(&BanExpiryHandler, banExpiryCheckTimerRef, banExpiryCheckInterval, std::placeholders::_1)); } } diff --git a/src/server/apps/worldserver/Main.cpp b/src/server/apps/worldserver/Main.cpp index f3db3add6..e95aadc7b 100644 --- a/src/server/apps/worldserver/Main.cpp +++ b/src/server/apps/worldserver/Main.cpp @@ -30,7 +30,6 @@ #include "Config.h" #include "DatabaseEnv.h" #include "DatabaseLoader.h" -#include "DeadlineTimer.h" #include "GitRevision.h" #include "IoContext.h" #include "MapMgr.h" @@ -91,14 +90,16 @@ public: static void Start(std::shared_ptr const& freezeDetector) { - freezeDetector->_timer.expires_from_now(boost::posix_time::seconds(5)); + // Calculate the expiration time 5seconds from now + auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(5); + freezeDetector->_timer.expires_at(expirationTime); freezeDetector->_timer.async_wait(std::bind(&FreezeDetector::Handler, std::weak_ptr(freezeDetector), std::placeholders::_1)); } static void Handler(std::weak_ptr freezeDetectorRef, boost::system::error_code const& error); private: - Acore::Asio::DeadlineTimer _timer; + boost::asio::steady_timer _timer; uint32 _worldLoopCounter; uint32 _lastChangeMsTime; uint32 _maxCoreStuckTimeInMs; @@ -631,7 +632,9 @@ void FreezeDetector::Handler(std::weak_ptr freezeDetectorRef, bo } } - freezeDetector->_timer.expires_from_now(boost::posix_time::seconds(1)); + // Calculate the expiration time + auto expirationTime = std::chrono::steady_clock::now() + std::chrono::seconds(1); + freezeDetector->_timer.expires_at(expirationTime); freezeDetector->_timer.async_wait(std::bind(&FreezeDetector::Handler, freezeDetectorRef, std::placeholders::_1)); } } diff --git a/src/server/shared/Network/NetworkThread.h b/src/server/shared/Network/NetworkThread.h index aca77faab..b280c16d4 100644 --- a/src/server/shared/Network/NetworkThread.h +++ b/src/server/shared/Network/NetworkThread.h @@ -18,14 +18,14 @@ #ifndef NetworkThread_h__ #define NetworkThread_h__ -#include "DeadlineTimer.h" #include "Define.h" #include "Errors.h" #include "IoContext.h" #include "Log.h" #include "Socket.h" -#include #include +#include +#include #include #include #include @@ -179,7 +179,7 @@ protected: { LOG_DEBUG("misc", "Network Thread Starting"); - _updateTimer.expires_from_now(boost::posix_time::milliseconds(1)); + _updateTimer.expires_at(std::chrono::steady_clock::now()); _updateTimer.async_wait([this](boost::system::error_code const&) { Update(); }); _ioContext.run(); @@ -193,7 +193,7 @@ protected: if (_stopped) return; - _updateTimer.expires_from_now(boost::posix_time::milliseconds(1)); + _updateTimer.expires_at(std::chrono::steady_clock::now()); _updateTimer.async_wait([this](boost::system::error_code const&) { Update(); }); AddNewSockets(); @@ -230,7 +230,7 @@ private: Acore::Asio::IoContext _ioContext; tcp::socket _acceptSocket; - Acore::Asio::DeadlineTimer _updateTimer; + boost::asio::steady_timer _updateTimer; bool _proxyHeaderReadingEnabled; }; diff --git a/src/server/shared/Realms/RealmList.cpp b/src/server/shared/Realms/RealmList.cpp index 5576cb262..a1c258edd 100644 --- a/src/server/shared/Realms/RealmList.cpp +++ b/src/server/shared/Realms/RealmList.cpp @@ -17,7 +17,6 @@ #include "RealmList.h" #include "DatabaseEnv.h" -#include "DeadlineTimer.h" #include "Log.h" #include "Resolver.h" #include "QueryResult.h" @@ -37,7 +36,7 @@ RealmList* RealmList::Instance() void RealmList::Initialize(Acore::Asio::IoContext& ioContext, uint32 updateInterval) { _updateInterval = updateInterval; - _updateTimer = std::make_unique(ioContext); + _updateTimer = std::make_unique(ioContext); _resolver = std::make_unique(ioContext); LoadBuildInfo(); @@ -228,7 +227,9 @@ void RealmList::UpdateRealms(boost::system::error_code const& error) if (_updateInterval) { - _updateTimer->expires_from_now(boost::posix_time::seconds(_updateInterval)); + // Calculate the expiration time _updateInterval from now + auto expiration_time = std::chrono::steady_clock::now() + std::chrono::seconds(_updateInterval); + _updateTimer->expires_at(expiration_time); _updateTimer->async_wait([this](boost::system::error_code const& errorCode){ UpdateRealms(errorCode); }); } } diff --git a/src/server/shared/Realms/RealmList.h b/src/server/shared/Realms/RealmList.h index 76456c3e3..9d8912ad2 100644 --- a/src/server/shared/Realms/RealmList.h +++ b/src/server/shared/Realms/RealmList.h @@ -20,11 +20,22 @@ #include "Define.h" #include "Realm.h" +#include #include #include #include // NOTE: this import is NEEDED (even though some IDEs report it as unused) #include +namespace Acore::Asio +{ + class IoContext; +} + +namespace boost::system +{ + class error_code; +} + struct RealmBuildInfo { uint32 Build; @@ -36,11 +47,6 @@ struct RealmBuildInfo std::array MacHash; }; -namespace boost::system -{ - class error_code; -} - /// Storage object for the list of realms on the server class AC_SHARED_API RealmList { @@ -70,7 +76,7 @@ private: std::vector _builds; RealmMap _realms; uint32 _updateInterval{0}; - std::unique_ptr _updateTimer; + std::unique_ptr _updateTimer; std::unique_ptr _resolver; };