Changeset 90962 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Aug 27, 2021 4:40:53 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

146601

Message:

Audio/Validation Kit: Implemented support for client-mode connection timeouts. ​bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioTestService.cpp (modified) (1 diff)
• AudioTestServiceClient.cpp (modified) (2 diffs)
• AudioTestServiceClient.h (modified) (1 diff)
• AudioTestServiceInternal.h (modified) (1 diff)
• AudioTestServiceTcp.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Audio/AudioTestService.cpp

@@ -1001 +1001 @@
          */
         PATSTRANSPORTCLIENT pTransportClient;
-        rc = pThis->pTransport->pfnWaitForConnect(pThis->pTransportInst, &pTransportClient);
+        rc = pThis->pTransport->pfnWaitForConnect(pThis->pTransportInst, 1000 /* msTimeout */, &pTransportClient);
         if (RT_FAILURE(rc))
             continue;

trunk/src/VBox/Devices/Audio/AudioTestServiceClient.cpp

@@ -312 +312 @@
 
 /**
- * Connects to an ATS peer.
+ * Connects to an ATS peer, extended version.
  *
  * @returns VBox status code.
  * @param   pClient             Client to connect.
- */
-int AudioTestSvcClientConnect(PATSCLIENT pClient)
+ * @param   msTimeout           Timeout (in ms) waiting for a connection to be established.
+ *                              Use RT_INDEFINITE_WAIT to wait indefinitely.
+ */
+int AudioTestSvcClientConnectEx(PATSCLIENT pClient, RTMSINTERVAL msTimeout)
 {
     int rc = pClient->pTransport->pfnStart(pClient->pTransportInst);
     if (RT_SUCCESS(rc))
     {
-        rc = pClient->pTransport->pfnWaitForConnect(pClient->pTransportInst, &pClient->pTransportClient);
+        rc = pClient->pTransport->pfnWaitForConnect(pClient->pTransportInst,
+                                                    msTimeout, &pClient->pTransportClient);
         if (RT_SUCCESS(rc))
         {
@@ -330 +333 @@
 
     return rc;
+}
+
+/**
+ * Connects to an ATS peer.
+ *
+ * @returns VBox status code.
+ * @param   pClient             Client to connect.
+ */
+int AudioTestSvcClientConnect(PATSCLIENT pClient)
+{
+    return AudioTestSvcClientConnectEx(pClient, 30 * 1000 /* msTimeout */);
 }
 

trunk/src/VBox/Devices/Audio/AudioTestServiceClient.h

@@ -47 +47 @@
 /** @name Connection handling.
  * @{ */
+int AudioTestSvcClientConnectEx(PATSCLIENT pClient, RTMSINTERVAL msTimeout);
 int AudioTestSvcClientConnect(PATSCLIENT pClient);
 int AudioTestSvcClientClose(PATSCLIENT pClient);

trunk/src/VBox/Devices/Audio/AudioTestServiceInternal.h

@@ -122 +122 @@
      * Waits for a new client to connect and returns the client specific data on
      * success.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnWaitForConnect, (PATSTRANSPORTINST pThis, PPATSTRANSPORTCLIENT ppClientNew));
+     *
+     * @returns VBox status code.
+     * @param   pThis               The transport instance.
+     * @param   msTimeout           Timeout (in ms) waiting for a connection to be established.
+     *                              Use RT_INDEFINITE_WAIT to wait indefinitely.
+     *                              This might or might not be supported by the specific transport implementation.
+     * @param   ppClientNew         Where to return the allocated client on success.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnWaitForConnect, (PATSTRANSPORTINST pThis, RTMSINTERVAL msTimeout, PPATSTRANSPORTCLIENT ppClientNew));
 
     /**

trunk/src/VBox/Devices/Audio/AudioTestServiceTcp.cpp

@@ -110 +110 @@
     /** Pointer to transport client to connect. */
     PATSTRANSPORTCLIENT                pClient;
+    /** Connection timeout (in ms).
+     *  Use RT_INDEFINITE_WAIT to wait indefinitely. */
+    uint32_t                           msTimeout;
 } ATSCONNCTX;
 /** Pointer to an Audio Test Service (ATS) TCP/IP connection context. */
@@ -201 +204 @@
     PATSTRANSPORTCLIENT pClient  = pConnCtx->pClient;
 
+    /** @todo Implement cancellation support for using pConnCtx->msTimeout. */
+
     RTSOCKET hTcpClient;
     int rc = RTTcpServerListen2(pThis->pTcpServer, &hTcpClient);
@@ -226 +231 @@
     PATSTRANSPORTCLIENT pClient  = pConnCtx->pClient;
 
+    uint64_t msStartTs = RTTimeMilliTS();
+
     for (;;)
     {
@@ -249 +256 @@
             return rc;
 
+        if (   pConnCtx->msTimeout         != RT_INDEFINITE_WAIT
+            && RTTimeMilliTS() - msStartTs >= pConnCtx->msTimeout)
+        {
+            return VERR_TIMEOUT;
+        }
+
         /* Delay a wee bit before retrying. */
         RTThreadUserWait(hSelf, 1536);
@@ -294 +307 @@
  * @interface_method_impl{ATSTRANSPORT,pfnWaitForConnect}
  */
-static DECLCALLBACK(int) atsTcpWaitForConnect(PATSTRANSPORTINST pThis, PPATSTRANSPORTCLIENT ppClientNew)
+static DECLCALLBACK(int) atsTcpWaitForConnect(PATSTRANSPORTINST pThis,  RTMSINTERVAL msTimeout, PPATSTRANSPORTCLIENT ppClientNew)
 {
     PATSTRANSPORTCLIENT pClient = (PATSTRANSPORTCLIENT)RTMemAllocZ(sizeof(ATSTRANSPORTCLIENT));
@@ -301 +314 @@
     int rc;
 
-    LogFunc(("enmConnMode=%#x\n", pThis->enmConnMode));
+    LogFunc(("msTimeout=%RU32, enmConnMode=%#x\n", msTimeout, pThis->enmConnMode));
+
+    uint64_t msStartTs = RTTimeMilliTS();
 
     if (pThis->enmConnMode == ATSCONNMODE_SERVER)
     {
+        /** @todo Implement cancellation support for using \a msTimeout. */
+
         pClient->fFromServer = true;
         rc = RTTcpServerListen2(pThis->pTcpServer, &pClient->hTcpClient);
@@ -320 +337 @@
                 break;
 
+            if (   msTimeout                   != RT_INDEFINITE_WAIT
+                && RTTimeMilliTS() - msStartTs >= msTimeout)
+            {
+                rc = VERR_TIMEOUT;
+                break;
+            }
+
             if (pThis->fStopConnecting)
             {
@@ -346 +370 @@
         ATSCONNCTX ConnCtx;
         RT_ZERO(ConnCtx);
-        ConnCtx.pInst   = pThis;
-        ConnCtx.pClient = pClient;
+        ConnCtx.pInst     = pThis;
+        ConnCtx.pClient   = pClient;
+        ConnCtx.msTimeout = msTimeout;
 
         rc = VINF_SUCCESS;