Removed Wait operations from Timer class

Use ManualResetEvent::Wait instead

Author: ritchiecarroll

src/lib/Timer.cpp

@@ -177,36 +177,3 @@ void Timer::Stop()
 
     m_timerThread.reset();
 }
-
-void Timer::Wait() const
-{
-    try
-    {
-        if (m_running && m_timerThread != nullptr)
-        {
-            const ThreadPtr timerThread = m_timerThread;
-
-            if (timerThread != nullptr)
-                timerThread->join();
-        }                
-    }
-    catch (...)
-    {
-        // ReSharper disable once CppRedundantControlFlowJump
-        return;
-    }
-}
-
-void Timer::EmptyCallback(const TimerPtr&, void*)
-{            
-}
-
-TimerPtr Timer::WaitTimer(const int32_t interval, const bool autoStart)
-{
-    TimerPtr waitTimer = NewSharedPtr<Timer>(interval, EmptyCallback);
-
-    if (autoStart)
-        waitTimer->Start();
-
-    return waitTimer;
-}

src/lib/transport/SubscriberConnector.cpp

@@ -47,7 +47,6 @@ void DataClient::SetSubscriptionInfo(const SubscriptionInfo& info)
 
 SubscriberConnector::SubscriberConnector() :
     m_port(0),
-    m_timer(Timer::NullPtr),
     m_maxRetries(-1),
     m_retryInterval(2000),
     m_maxRetryInterval(120000),
@@ -127,8 +126,8 @@ void SubscriberConnector::AutoReconnect(DataClient* client)
             connector.m_clientErrorMessageCallback(client, errorMessageStream.str());
         }
 
-        connector.m_timer = Timer::WaitTimer(retryInterval);
-        connector.m_timer->Wait();
+        connector.m_waitHandle.Reset();
+        connector.m_waitHandle.Wait(retryInterval);
 
         if (connector.m_cancel || client->m_disposing)
             return;
@@ -279,8 +278,8 @@ int SubscriberConnector::Connect(DataClient& client, bool autoReconnecting)
 
             if (retryInterval > 0)
             {
-                m_timer = Timer::WaitTimer(retryInterval);
-                m_timer->Wait();
+                m_waitHandle.Reset();
+                m_waitHandle.Wait(retryInterval);
 
                 if (m_cancel)
                     return ConnectCanceled;
@@ -297,8 +296,7 @@ void SubscriberConnector::Cancel()
     m_cancel = true;
 
     // Cancel any waiting timer operations by setting immediate timer expiration
-    if (m_timer != nullptr)
-        m_timer->Stop();
+    m_waitHandle.Set();
 
     m_autoReconnectThread.join();
 }

src/lib/transport/SubscriberConnector.h

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "../Timer.h"
+#include "../ManualResetEvent.h"
 #include "SubscriptionInfo.h"
 
 namespace sttp::transport
@@ -73,7 +73,7 @@ namespace sttp::transport
 
         std::string m_hostname;
         uint16_t m_port;
-        TimerPtr m_timer;
+        ManualResetEvent m_waitHandle;
 
         int32_t m_maxRetries;
         int32_t m_retryInterval;