Changeset 60517 in vbox for trunk/src/VBox/ValidationKit/utils/usb/UsbTestService.cpp

Timestamp:

Apr 15, 2016 12:20:51 PM (9 years ago)

Author:

vboxsync

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

106633

Message:

ValidationKit/usb: Updates for UsbTestService

File:

• trunk/src/VBox/ValidationKit/utils/usb/UsbTestService.cpp (modified) (3 diffs)

trunk/src/VBox/ValidationKit/utils/usb/UsbTestService.cpp

@@ -58 +58 @@
 #include "UsbTestServiceInternal.h"
 #include "UsbTestServiceGadget.h"
+#include "UsbTestServicePlatform.h"
 
 
@@ -1045 +1046 @@
     if (RT_SUCCESS(rc))
     {
-        rc = RTCritSectInit(&g_CritSectClients);
+        rc = utsPlatformInit();
         if (RT_SUCCESS(rc))
         {
-            rc = RTPipeCreate(&g_hPipeR, &g_hPipeW, 0);
+            rc = RTCritSectInit(&g_CritSectClients);
             if (RT_SUCCESS(rc))
             {
-                /* Spin off the thread serving connections. */
-                rc = RTThreadCreate(&g_hThreadServing, utsClientWorker, NULL, 0, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE,
-                                    "USBTSTSRV");
+                rc = RTPipeCreate(&g_hPipeR, &g_hPipeW, 0);
                 if (RT_SUCCESS(rc))
-                    return VINF_SUCCESS;
+                {
+                    /* Spin off the thread serving connections. */
+                    rc = RTThreadCreate(&g_hThreadServing, utsClientWorker, NULL, 0, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE,
+                                        "USBTSTSRV");
+                    if (RT_SUCCESS(rc))
+                        return VINF_SUCCESS;
+                    else
+                        RTMsgError("Creating the client worker thread failed with %Rrc\n", rc);
+
+                    RTPipeClose(g_hPipeR);
+                    RTPipeClose(g_hPipeW);
+                }
                 else
-                    RTMsgError("Creating the client worker thread failed with %Rrc\n", rc);
-
-                RTPipeClose(g_hPipeR);
-                RTPipeClose(g_hPipeW);
+                    RTMsgError("Creating communications pipe failed with %Rrc\n", rc);
+
+                RTCritSectDelete(&g_CritSectClients);
             }
             else
-                RTMsgError("Creating communications pipe failed with %Rrc\n", rc);
-
-            RTCritSectDelete(&g_CritSectClients);
+                RTMsgError("Creating global critical section failed with %Rrc\n", rc);
+
+            utsConfigAstDestroy(g_pCfgAst);
         }
         else
-            RTMsgError("Creating global critical section failed with %Rrc\n", rc);
-
-        utsConfigAstDestroy(g_pCfgAst);
-    }
-    else
-    {
-        if (RTErrInfoIsSet(pErrInfo))
         {
-            RTMsgError("Failed to parse config with detailed error: %s (%Rrc)\n",
-                       pErrInfo->pszMsg, pErrInfo->rc);
-            RTErrInfoFree(pErrInfo);
+            if (RTErrInfoIsSet(pErrInfo))
+            {
+                RTMsgError("Failed to parse config with detailed error: %s (%Rrc)\n",
+                           pErrInfo->pszMsg, pErrInfo->rc);
+                RTErrInfoFree(pErrInfo);
+            }
+            else
+                RTMsgError("Faield to parse config with unknown error (%Rrc)\n", rc);
+            return rc;
         }
-        else
-            RTMsgError("Faield to parse config with unknown error (%Rrc)\n", rc);
-        return rc;
     }
 
@@ -1425 +1430 @@
     g_pTransport->pfnTerm();
 
+    utsPlatformTerm();
+
     return rcExit;
 }