From b4f7948dfbe991879dca39dc9b3d53056b8a9e81 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 9 Jul 2025 20:14:21 +0200 Subject: Core/Database: Add Empty and CancelAll functions to AsyncCallbackProcessor and enable callback concept check --- src/common/Utilities/AsyncCallbackProcessor.h | 32 ++++++++++++++---------- src/common/Utilities/AsyncCallbackProcessorFwd.h | 29 +++++++++++++++++++++ src/server/database/Database/DatabaseEnvFwd.h | 7 +++--- src/server/database/Database/QueryCallback.h | 2 ++ src/server/database/Database/QueryHolder.h | 2 ++ src/server/database/Database/Transaction.h | 2 ++ 6 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 src/common/Utilities/AsyncCallbackProcessorFwd.h (limited to 'src') diff --git a/src/common/Utilities/AsyncCallbackProcessor.h b/src/common/Utilities/AsyncCallbackProcessor.h index 8a0b123b1b7..5a45ab254a2 100644 --- a/src/common/Utilities/AsyncCallbackProcessor.h +++ b/src/common/Utilities/AsyncCallbackProcessor.h @@ -15,16 +15,13 @@ * with this program. If not, see . */ -#ifndef AsyncCallbackProcessor_h__ -#define AsyncCallbackProcessor_h__ +#ifndef TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_H +#define TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_H -#include +#include "AsyncCallbackProcessorFwd.h" #include -//template -//concept AsyncCallback = requires(T t) { { t.InvokeIfReady() } -> std::convertible_to }; - -template // requires AsyncCallback +template class AsyncCallbackProcessor { public: @@ -33,8 +30,7 @@ public: T& AddCallback(T&& query) { - _callbacks.emplace_back(std::move(query)); - return _callbacks.back(); + return _callbacks.emplace_back(std::move(query)); } void ProcessReadyCallbacks() @@ -44,14 +40,24 @@ public: std::vector updateCallbacks{ std::move(_callbacks) }; - updateCallbacks.erase(std::remove_if(updateCallbacks.begin(), updateCallbacks.end(), [](T& callback) + std::erase_if(updateCallbacks, [](T& callback) { - return callback.InvokeIfReady(); - }), updateCallbacks.end()); + return InvokeAsyncCallbackIfReady(callback); + }); _callbacks.insert(_callbacks.end(), std::make_move_iterator(updateCallbacks.begin()), std::make_move_iterator(updateCallbacks.end())); } + bool Empty() const + { + return _callbacks.empty(); + } + + void CancelAll() + { + _callbacks.clear(); + } + private: AsyncCallbackProcessor(AsyncCallbackProcessor const&) = delete; AsyncCallbackProcessor& operator=(AsyncCallbackProcessor const&) = delete; @@ -59,4 +65,4 @@ private: std::vector _callbacks; }; -#endif // AsyncCallbackProcessor_h__ +#endif // TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_H diff --git a/src/common/Utilities/AsyncCallbackProcessorFwd.h b/src/common/Utilities/AsyncCallbackProcessorFwd.h new file mode 100644 index 00000000000..8eb8b700210 --- /dev/null +++ b/src/common/Utilities/AsyncCallbackProcessorFwd.h @@ -0,0 +1,29 @@ +/* + * This file is part of the TrinityCore 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 General Public License as published by the + * Free Software Foundation; either version 2 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 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 TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_FWD_H +#define TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_FWD_H + +#include + +template +concept AsyncCallback = requires(T& t) { { InvokeAsyncCallbackIfReady(t) } -> std::convertible_to; }; + +template +class AsyncCallbackProcessor; + +#endif // TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_FWD_H diff --git a/src/server/database/Database/DatabaseEnvFwd.h b/src/server/database/Database/DatabaseEnvFwd.h index 18c4216a193..1e36ee0e861 100644 --- a/src/server/database/Database/DatabaseEnvFwd.h +++ b/src/server/database/Database/DatabaseEnvFwd.h @@ -18,6 +18,7 @@ #ifndef DatabaseEnvFwd_h__ #define DatabaseEnvFwd_h__ +#include "AsyncCallbackProcessorFwd.h" #include struct QueryResultFieldMetadata; @@ -45,9 +46,7 @@ class PreparedResultSet; using PreparedQueryResult = std::shared_ptr; class QueryCallback; - -template -class AsyncCallbackProcessor; +bool InvokeAsyncCallbackIfReady(QueryCallback& callback); using QueryCallbackProcessor = AsyncCallbackProcessor; @@ -57,6 +56,7 @@ template class Transaction; class TransactionCallback; +bool InvokeAsyncCallbackIfReady(TransactionCallback& callback); template using SQLTransaction = std::shared_ptr>; @@ -77,6 +77,7 @@ using LoginDatabaseQueryHolder = SQLQueryHolder; using WorldDatabaseQueryHolder = SQLQueryHolder; class SQLQueryHolderCallback; +bool InvokeAsyncCallbackIfReady(SQLQueryHolderCallback& callback); // mysql struct MySQLHandle; diff --git a/src/server/database/Database/QueryCallback.h b/src/server/database/Database/QueryCallback.h index 72b4ca1202a..efb76d75219 100644 --- a/src/server/database/Database/QueryCallback.h +++ b/src/server/database/Database/QueryCallback.h @@ -57,4 +57,6 @@ private: std::queue> _callbacks; }; +inline bool InvokeAsyncCallbackIfReady(QueryCallback& callback) { return callback.InvokeIfReady(); } + #endif // _QUERY_CALLBACK_H diff --git a/src/server/database/Database/QueryHolder.h b/src/server/database/Database/QueryHolder.h index a0a0b2b2d0f..e274a7b1165 100644 --- a/src/server/database/Database/QueryHolder.h +++ b/src/server/database/Database/QueryHolder.h @@ -79,4 +79,6 @@ public: std::function m_callback; }; +inline bool InvokeAsyncCallbackIfReady(SQLQueryHolderCallback& callback) { return callback.InvokeIfReady(); } + #endif diff --git a/src/server/database/Database/Transaction.h b/src/server/database/Database/Transaction.h index 9c4284b49c8..da7fafb5a1a 100644 --- a/src/server/database/Database/Transaction.h +++ b/src/server/database/Database/Transaction.h @@ -122,4 +122,6 @@ public: std::function m_callback; }; +inline bool InvokeAsyncCallbackIfReady(TransactionCallback& callback) { return callback.InvokeIfReady(); } + #endif -- cgit v1.2.3