[ONEM-31782] wait for Websocket in Open() (#1378)

* [ONEM-31782] wait for Websocket in Open()

* [ONEM-31782] simplify code

* [ONEM-31782] unify SLEEPSLOT_POLLING_TIME

Author: dawid-trendota-red

Source/core/Portability.h

@@ -484,6 +484,7 @@ int clock_gettime(int, struct timespec*);
 
 #define ALLOCA alloca
 
+#define SLEEPSLOT_POLLING_TIME 100
 extern void EXTERNAL SleepMs(const unsigned int a_Time);
 extern void EXTERNAL SleepUs(const unsigned int a_Time);
 inline void EXTERNAL SleepS(unsigned int a_Time)

Source/core/SerialPort.cpp

@@ -52,8 +52,6 @@
 namespace WPEFramework {
 namespace Core {
 
-    static constexpr uint32_t SLEEPSLOT_TIME = 100;
-
 //////////////////////////////////////////////////////////////////////
 // SerialPort::SerialMonitor
 //////////////////////////////////////////////////////////////////////
@@ -646,11 +644,11 @@ namespace Core {
                 // Make sure we aren't in the monitor thread waiting for close completion.
                 ASSERT(Core::Thread::ThreadId() != ResourceMonitor::Instance().Id());
 
-                uint32_t sleepSlot = (waiting > SLEEPSLOT_TIME ? SLEEPSLOT_TIME : waiting);
+                uint32_t sleepSlot = (waiting > SLEEPSLOT_POLLING_TIME ? SLEEPSLOT_POLLING_TIME : waiting);
 
                 _adminLock.Unlock();
 
-                // Right, lets sleep in slices of <= SLEEPSLOT_TIME ms
+                // Right, lets sleep in slices of <= SLEEPSLOT_POLLING_TIME ms
                 SleepMs(sleepSlot);
 
                 _adminLock.Lock();

Source/core/SocketPort.cpp

@@ -262,7 +262,6 @@ namespace WPEFramework {
         //////////////////////////////////////////////////////////////////////
 
         static constexpr uint32_t MAX_LISTEN_QUEUE = 64;
-        static constexpr uint32_t SLEEPSLOT_TIME = 100;
 
         inline void DestroySocket(SOCKET& socket)
         {
@@ -896,7 +895,7 @@ namespace WPEFramework {
                 // Make sure we aren't in the monitor thread waiting for close completion.
                 ASSERT(Core::Thread::ThreadId() != ResourceMonitor::Instance().Id());
 
-                uint32_t sleepSlot = (waiting > SLEEPSLOT_TIME ? SLEEPSLOT_TIME : waiting);
+                uint32_t sleepSlot = (waiting > SLEEPSLOT_POLLING_TIME ? SLEEPSLOT_POLLING_TIME : waiting);
 
                 m_syncAdmin.Unlock();
 
@@ -931,7 +930,7 @@ namespace WPEFramework {
                 // Make sure we aren't in the monitor thread waiting for close completion.
                 ASSERT(Core::Thread::ThreadId() != ResourceMonitor::Instance().Id());
 
-                uint32_t sleepSlot = (waiting > SLEEPSLOT_TIME ? SLEEPSLOT_TIME : waiting);
+                uint32_t sleepSlot = (waiting > SLEEPSLOT_POLLING_TIME ? SLEEPSLOT_POLLING_TIME : waiting);
 
                 // Right, lets sleep in slices of 100 ms
                 SleepMs(sleepSlot);
@@ -959,11 +958,11 @@ namespace WPEFramework {
                 // Make sure we aren't in the monitor thread waiting for close completion.
                 ASSERT(Core::Thread::ThreadId() != ResourceMonitor::Instance().Id());
 
-                uint32_t sleepSlot = (waiting > SLEEPSLOT_TIME ? SLEEPSLOT_TIME : waiting);
+                uint32_t sleepSlot = (waiting > SLEEPSLOT_POLLING_TIME ? SLEEPSLOT_POLLING_TIME : waiting);
 
                 m_syncAdmin.Unlock();
 
-                // Right, lets sleep in slices of <= SLEEPSLOT_TIME ms
+                // Right, lets sleep in slices of <= SLEEPSLOT_POLLING_TIME ms
                 SleepMs(sleepSlot);
 
                 m_syncAdmin.Lock();

Source/websocket/WebSocketLink.h

@@ -1022,9 +1022,34 @@ POP_WARNING()
         {
             return (_channel.AbortUpgrade(status, reason));
         }
+        uint32_t WaitForLink(const uint32_t time) const
+        {
+            // Make sure the state does not change in the mean time.
+            Lock();
+
+            uint32_t waiting = (time == Core::infinite ? Core::infinite : time); // Expect time in MS.
+
+            // Right, a wait till connection is closed is requested..
+            while ((waiting > 0) && (IsWebSocket() == false)) {
+                uint32_t sleepSlot = (waiting > SLEEPSLOT_POLLING_TIME ? SLEEPSLOT_POLLING_TIME : waiting);
+
+                Unlock();
+                // Right, lets sleep in slices of 100 ms
+                SleepMs(sleepSlot);
+                Lock();
+
+                waiting -= (waiting == Core::infinite ? 0 : sleepSlot);
+            }
+
+            uint32_t result = (((time == 0) || (IsWebSocket() == true)) ? Core::ERROR_NONE : Core::ERROR_TIMEDOUT);
+            Unlock();
+            return (result);
+        }
         uint32_t Open(const uint32_t waitTime)
         {
-            return (_channel.Open(waitTime));
+            _channel.Open(0);
+
+            return WaitForLink(waitTime);
         }
         uint32_t Close(const uint32_t waitTime)
         {