Improved DataSubscriber shutdown operations when auto-reconnect timer is enabled.

Author: ritchiecarroll

src/lib/CommonTypes.h

@@ -247,7 +247,7 @@ namespace sttp
     typedef boost::asio::io_context IOContext;
     typedef boost::asio::io_context::strand Strand;
     #endif
-    typedef boost::asio::deadline_timer DeadlineTimer;
+    typedef boost::asio::steady_timer SteadyTimer;
     typedef boost::asio::ip::address IPAddress;
     typedef boost::asio::ip::tcp::socket TcpSocket;
     typedef boost::asio::ip::udp::socket UdpSocket;

src/lib/Convert.cpp

@@ -428,20 +428,17 @@ Guid sttp::ParseGuid(const uint8_t* data, bool swapEndianness)
                 copy[i] = swappedBytes[i];
         }
 
-        if (swapEndianness)
-        {
-            // Convert Microsoft encoding to RFC
-            swappedBytes[3] = copy[0];
-            swappedBytes[2] = copy[1];
-            swappedBytes[1] = copy[2];
-            swappedBytes[0] = copy[3];
+        // Convert Microsoft encoding to RFC
+        swappedBytes[3] = copy[0];
+        swappedBytes[2] = copy[1];
+        swappedBytes[1] = copy[2];
+        swappedBytes[0] = copy[3];
 
-            swappedBytes[4] = copy[5];
-            swappedBytes[5] = copy[4];
+        swappedBytes[4] = copy[5];
+        swappedBytes[5] = copy[4];
 
-            swappedBytes[6] = copy[7];
-            swappedBytes[7] = copy[6];
-        }
+        swappedBytes[6] = copy[7];
+        swappedBytes[7] = copy[6];
 
         encodedBytes = swappedBytes;
     }

src/lib/Version.h

@@ -25,7 +25,7 @@
 #define __VERSION_H
 
 #define STTP_TITLE "STTP C++ Library"
-#define STTP_VERSION "1.0.7"
-#define STTP_UPDATEDON "2019-07-01"
+#define STTP_VERSION "1.0.8"
+#define STTP_UPDATEDON "2019-07-02"
 
 #endif

src/lib/transport/DataSubscriber.cpp

@@ -33,6 +33,7 @@
 #include <boost/bind.hpp>
 
 using namespace std;
+using namespace std::chrono;
 using namespace boost;
 using namespace boost::asio;
 using namespace boost::asio::ip;
@@ -60,6 +61,7 @@ SubscriptionInfo::SubscriptionInfo() :
 
 SubscriberConnector::SubscriberConnector() :
     m_port(0),
+    m_timer(nullptr),
     m_maxRetries(-1),
     m_retryInterval(2000),
     m_maxRetryInterval(120000),
@@ -113,8 +115,15 @@ void SubscriberConnector::AutoReconnect(DataSubscriber* subscriber)
     if (retryInterval > 0)
     {
         IOContext io;
-        DeadlineTimer timer(io, Milliseconds(retryInterval));
-        timer.wait();
+
+        connector.m_timer = new SteadyTimer(io, milliseconds(retryInterval));
+        connector.m_timer->wait();
+
+        if (connector.m_cancel)
+            return;
+        
+        delete connector.m_timer;
+        connector.m_timer = nullptr;
     }
 
     connector.Connect(*subscriber, true);
@@ -208,8 +217,15 @@ bool SubscriberConnector::Connect(DataSubscriber& subscriber, bool autoReconnect
             if (retryInterval > 0)
             {
                 IOContext io;
-                DeadlineTimer timer(io, Milliseconds(retryInterval));
-                timer.wait();
+                
+                m_timer = new SteadyTimer(io, milliseconds(retryInterval));
+                m_timer->wait();
+
+                if (m_cancel)
+                    return false;
+                
+                delete m_timer;
+                m_timer = nullptr;
             }
         }
     }
@@ -222,6 +238,16 @@ bool SubscriberConnector::Connect(DataSubscriber& subscriber, bool autoReconnect
 void SubscriberConnector::Cancel()
 {
     m_cancel = true;
+
+    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;
+    }
 }
 
 // Sets the hostname of the publisher to connect to.

src/lib/transport/DataSubscriber.h

@@ -80,6 +80,7 @@ namespace transport
 
         std::string m_hostname;
         uint16_t m_port;
+        SteadyTimer* m_timer;
 
         int32_t m_maxRetries;
         int32_t m_retryInterval;