Converted reconnect operation wait timer to use sttp::Timer

Author: ritchiecarroll

src/lib/Timer.h

@@ -32,6 +32,7 @@ namespace sttp
 {
     class Timer;
     typedef std::function<void(Timer* timer, void* userData)> TimerElapsedCallback;
+    typedef sttp::SharedPtr<Timer> TimerPtr;
 
     class Timer // NOLINT
     {
@@ -153,6 +154,26 @@ namespace sttp
 
             m_timerThread.reset();
         }
+
+        void Wait() const
+        {
+            if (m_running && m_timerThread != nullptr)
+                m_timerThread->join();
+        }
+
+        static void EmptyCallback(Timer*, void*)
+        {            
+        }
+
+        static TimerPtr WaitTimer(const int32_t interval, bool autoStart = true)
+        {
+            TimerPtr waitTimer = NewSharedPtr<Timer>(interval, EmptyCallback);
+
+            if (autoStart)
+                waitTimer->Start();
+
+            return waitTimer;
+        }
     };
 
     typedef sttp::SharedPtr<Timer> TimerPtr;

src/lib/transport/DataSubscriber.cpp

@@ -24,16 +24,15 @@
 //******************************************************************************************************
 
 #include "DataSubscriber.h"
-#include "../Version.h"
 #include "Constants.h"
 #include "CompactMeasurement.h"
 #include "../Convert.h"
 #include "../EndianConverter.h"
+#include "../Version.h"
 #include <sstream>
 #include <boost/bind.hpp>
 
 using namespace std;
-using namespace std::chrono;
 using namespace boost;
 using namespace boost::asio;
 using namespace boost::asio::ip;
@@ -114,19 +113,15 @@ void SubscriberConnector::AutoReconnect(DataSubscriber* subscriber)
 
     if (retryInterval > 0)
     {
-        IOContext io;
-
-        connector.m_timer = new SteadyTimer(io, milliseconds(retryInterval));
-        connector.m_timer->wait();
+        connector.m_timer = Timer::WaitTimer(retryInterval);
+        connector.m_timer->Wait();
 
         if (connector.m_cancel)
             return;
-        
-        delete connector.m_timer;
-        connector.m_timer = nullptr;
     }
 
-    connector.Connect(*subscriber, true);
+    if (connector.Connect(*subscriber, true) == ConnectCanceled)
+        return;
 
     // Notify the user that reconnect attempt was completed.
     if (!connector.m_cancel && connector.m_reconnectCallback != nullptr)
@@ -146,14 +141,17 @@ void SubscriberConnector::RegisterReconnectCallback(const ReconnectCallback& rec
     m_reconnectCallback = reconnectCallback;
 }
 
-bool SubscriberConnector::Connect(DataSubscriber& subscriber, const SubscriptionInfo& info)
+int SubscriberConnector::Connect(DataSubscriber& subscriber, const SubscriptionInfo& info)
 {
+    if (m_cancel)
+        return ConnectCanceled;
+
     subscriber.SetSubscriptionInfo(info);
     return Connect(subscriber, false);
 }
 
 // Begin connection sequence.
-bool SubscriberConnector::Connect(DataSubscriber& subscriber, bool autoReconnecting)
+int SubscriberConnector::Connect(DataSubscriber& subscriber, bool autoReconnecting)
 {
     if (m_autoReconnect)
         subscriber.RegisterAutoReconnectCallback(&AutoReconnect);
@@ -216,21 +214,16 @@ bool SubscriberConnector::Connect(DataSubscriber& subscriber, bool autoReconnect
 
             if (retryInterval > 0)
             {
-                IOContext io;
-                
-                m_timer = new SteadyTimer(io, milliseconds(retryInterval));
-                m_timer->wait();
+                m_timer = Timer::WaitTimer(retryInterval);
+                m_timer->Wait();
 
                 if (m_cancel)
-                    return false;
-                
-                delete m_timer;
-                m_timer = nullptr;
+                    return ConnectCanceled;
             }
         }
     }
 
-    return subscriber.IsConnected();
+    return subscriber.IsConnected() ? ConnectSuccess : ConnectFailed;
 }
 
 // Cancel all current and
@@ -239,15 +232,9 @@ void SubscriberConnector::Cancel()
 {
     m_cancel = true;
 
+    // Cancel any waiting timer operations by setting immediate timer expiration
     if (m_timer != nullptr)
-    {
-        // Cancel any waiting timer operations by setting immediate timer expiration
-        m_timer->expires_at(SteadyTimer::time_point::min());
-        m_timer->wait();
-                
-        delete m_timer;
-        m_timer = nullptr;
-    }
+        m_timer->Stop();
 }
 
 // Sets the hostname of the publisher to connect to.

src/lib/transport/DataSubscriber.h

@@ -29,6 +29,7 @@
 #include "TransportTypes.h"
 #include "SignalIndexCache.h"
 #include "tssc/TSSCDecoder.h"
+#include "../Timer.h"
 #include "../ThreadSafeQueue.h"
 
 namespace sttp {
@@ -80,7 +81,7 @@ namespace transport
 
         std::string m_hostname;
         uint16_t m_port;
-        SteadyTimer* m_timer;
+        sttp::TimerPtr m_timer;
 
         int32_t m_maxRetries;
         int32_t m_retryInterval;
@@ -93,9 +94,13 @@ namespace transport
         // Auto-reconnect handler.
         static void AutoReconnect(DataSubscriber* subscriber);
 
-        bool Connect(DataSubscriber& subscriber, bool autoReconnecting);
+        int Connect(DataSubscriber& subscriber, bool autoReconnecting);
 
     public:
+        static constexpr int ConnectSuccess = 1;
+        static constexpr int ConnectFailed = 0;
+        static constexpr int ConnectCanceled = -1;
+
         // Creates a new instance.
         SubscriberConnector();
 
@@ -109,7 +114,7 @@ namespace transport
         void RegisterReconnectCallback(const ReconnectCallback& reconnectCallback);
 
         // Begin connection sequence
-        bool Connect(DataSubscriber& subscriber, const SubscriptionInfo& info);
+        int Connect(DataSubscriber& subscriber, const SubscriptionInfo& info);
 
         // Cancel all current and
         // future connection sequences.

src/lib/transport/SubscriberInstance.cpp

@@ -180,7 +180,9 @@ void SubscriberInstance::Connect()
     }
 
     // Connect and subscribe to publisher
-    if (connector.Connect(*m_subscriber, m_subscriptionInfo))
+    const int result = connector.Connect(*m_subscriber, m_subscriptionInfo);
+
+    if (result == SubscriberConnector::ConnectSuccess)
     {
         ConnectionEstablished();
 
@@ -194,7 +196,8 @@ void SubscriberInstance::Connect()
     }
     else
     {
-        ErrorMessage("All connection attempts failed");
+        if (result == SubscriberConnector::ConnectFailed)
+            ErrorMessage("All connection attempts failed");
     }
 }