Core/Database: Add Empty and CancelAll functions to AsyncCallbackProcessor and enable callback concept check

2 files changed, 48 insertions, 13 deletions

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 <http://www.gnu.org/licenses/>.
  */
 
-#ifndef AsyncCallbackProcessor_h__
-#define AsyncCallbackProcessor_h__
+#ifndef TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_H
+#define TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_H
 
-#include <algorithm>
+#include "AsyncCallbackProcessorFwd.h"
 #include <vector>
 
-//template <class T>
-//concept AsyncCallback = requires(T t) { { t.InvokeIfReady() } -> std::convertible_to<bool> };
-
-template<typename T> // requires AsyncCallback<T>
+template<AsyncCallback T>
 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<T> 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<T> _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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_FWD_H
+#define TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_FWD_H
+
+#include <concepts>
+
+template <typename T>
+concept AsyncCallback = requires(T& t) { { InvokeAsyncCallbackIfReady(t) } -> std::convertible_to<bool>; };
+
+template<AsyncCallback T>
+class AsyncCallbackProcessor;
+
+#endif // TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_FWD_H