Update Antispam for ACE branch.

Author: ratkosrb

src/game/Anticheat/Antispam/Antispam.cpp

@@ -30,27 +30,9 @@ static inline void ReplaceAllW(std::wstring &str, const std::wstring& from, cons
     }
 }
 
-void AntispamAsyncWorker(Antispam *antispam)
-{
-    using namespace std::chrono_literals;
-    LoginDatabase.ThreadStart();
-    LogsDatabase.ThreadStart();
-    auto prevNow = Clock::now();
-    while (!sWorld.IsStopped())
-    {
-        auto currNow = Clock::now();
-        auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(currNow - prevNow).count();
-        antispam->processMessages(diff);
-        prevNow = currNow;
-        std::this_thread::sleep_for(50ms);
-    }
-    LogsDatabase.ThreadEnd();
-    LoginDatabase.ThreadEnd();
-}
-
 Antispam::Antispam()
     : m_enabled(false), m_restrictionLevel(0), m_originalNormalizeMask(0), m_fullyNormalizeMask(0),
-    m_threshold(0), m_mutetime(0), m_chatMask(0), m_worker(), m_banEnabled(false), m_detectThreshold(3),
+    m_threshold(0), m_mutetime(0), m_chatMask(0), m_worker(nullptr), m_banEnabled(false), m_detectThreshold(3),
     m_messageBlockSize(5), m_updateTimer(60000), m_messageRepeatCount(5), m_frequencyCount(5.0f), m_frequencyTime(6.0f),
     m_mergeAllWhispers(false)
 {
@@ -169,14 +151,14 @@ void Antispam::loadConfig()
     m_frequencyCount = sWorld.getConfig(CONFIG_UINT32_AC_ANTISPAM_FREQUENCY_COUNT);
     m_frequencyCoeff = m_frequencyCount / m_frequencyTime;
 
-    if (!m_worker.joinable())
-        m_worker = std::thread(AntispamAsyncWorker, this);
+    if (!m_worker)
+        m_worker = new ACE_Based::Thread(new AntispamAsyncWorker(this));
 }
 
 void Antispam::PushToMessageQueue(MessageBlock const& messageBlock)
 {
 #ifdef USE_STANDARD_MALLOC
-    std::lock_guard<std::mutex> lock(m_messageMutex);
+    ACE_Guard<ACE_Thread_Mutex> guard(m_messageMutex);
     m_messageQueue.push(messageBlock);
 #else
     m_messageQueue.push(messageBlock);
@@ -186,7 +168,7 @@ void Antispam::PushToMessageQueue(MessageBlock const& messageBlock)
 bool Antispam::TryPopFromMessageQueue(MessageBlock& messageBlock)
 {
 #ifdef USE_STANDARD_MALLOC
-    std::lock_guard<std::mutex> lock(m_messageMutex);
+    ACE_Guard<ACE_Thread_Mutex> guard(m_messageMutex);
     if (m_messageQueue.empty())
         return false;
     messageBlock = m_messageQueue.front();

src/game/Anticheat/Antispam/Antispam.h

@@ -3,10 +3,9 @@
 
 #include <string>
 #include <chrono>
-#include <thread>
 
 #ifdef USE_STANDARD_MALLOC
-#include <mutex>
+#include "ace/Thread_Mutex.h"
 #else
 #include <tbb/concurrent_queue.h>
 #endif
@@ -106,8 +105,8 @@ class Antispam : public AntispamInterface
     Antispam();
     ~Antispam()
     {
-        if (m_worker.joinable())
-            m_worker.join();
+        if (m_worker)
+            m_worker->wait();
     }
 
     void loadFromDB();
@@ -170,7 +169,7 @@ class Antispam : public AntispamInterface
     MutedAccountsSet m_mutedAccounts;
 
 #ifdef USE_STANDARD_MALLOC
-    std::mutex m_messageMutex;
+    ACE_Thread_Mutex m_messageMutex;
 #endif
 
     void PushToMessageQueue(MessageBlock const& messageBlock);
@@ -181,7 +180,33 @@ class Antispam : public AntispamInterface
     MessageCounters m_messageCounters[A_CHAT_TYPE_MAX];
     MessageRepeats m_messageRepeats[A_CHAT_TYPE_MAX];
 
-    std::thread m_worker;
+    ACE_Based::Thread *m_worker;
+};
+
+class AntispamAsyncWorker : public ACE_Based::Runnable
+{
+public:
+    AntispamAsyncWorker(Antispam *antispam) : m_antispam(antispam)
+    {
+    }
+
+    virtual void run()
+    {
+        LoginDatabase.ThreadStart();
+        LogsDatabase.ThreadStart();
+        auto prevNow = Clock::now();
+        while (!sWorld.IsStopped())
+        {
+            auto currNow = Clock::now();
+            auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(currNow - prevNow).count();
+            m_antispam->processMessages(diff);
+            prevNow = currNow;
+            ACE_Based::Thread::Sleep(50);
+        }
+        LogsDatabase.ThreadEnd();
+        LoginDatabase.ThreadEnd();
+    }
+    Antispam* m_antispam;
 };
 
 #define sAntispam ACE_Singleton<Antispam, ACE_Null_Mutex>::instance()