Changeset 90176 in vbox for trunk

Timestamp:

Jul 14, 2021 9:38:43 AM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: ATS termination fixes. bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioTestService.cpp (modified) (3 diffs)
• AudioTestServiceTcp.cpp (modified) (1 diff)

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

@@ -936 +936 @@
  * @returns VBox status code.
  */
-static DECLCALLBACK(int) atsConnectThread(RTTHREAD hThread, void *pvUser)
+static DECLCALLBACK(int) atsMainThread(RTTHREAD hThread, void *pvUser)
 {
     RT_NOREF(hThread);
@@ -1090 +1090 @@
     {
         /* Spin off the connection thread. */
-        rc = RTThreadCreate(&pThis->hThreadMain, atsConnectThread, pThis, 0, RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE,
+        rc = RTThreadCreate(&pThis->hThreadMain, atsMainThread, pThis, 0, RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE,
                             "AUDTSTSRVM");
         if (RT_SUCCESS(rc))
@@ -1173 +1173 @@
     RTPollSetDestroy(pThis->hPollSet);
     pThis->hPollSet = NIL_RTPOLLSET;
-
-    pThis->pTransport = NULL;
 
     PATSSERVERINST pIt, pItNext;

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

@@ -688 +688 @@
     atsTcpConnectWaitOnThreads(pThis, 15000);
 
+    LogFunc(("Done\n"));
+}
+
+/**
+ * @interface_method_impl{ATSTRANSPORT,pfnCreate}
+ */
+static DECLCALLBACK(int) atsTcpCreate(PATSTRANSPORTINST *ppThis)
+{
+    PATSTRANSPORTINST pThis = (PATSTRANSPORTINST)RTMemAllocZ(sizeof(ATSTRANSPORTINST));
+    AssertPtrReturn(pThis, VERR_NO_MEMORY);
+
+    *ppThis = pThis;
+    return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{ATSTRANSPORT,pfnDestroy}
+ */
+static DECLCALLBACK(int) atsTcpDestroy(PATSTRANSPORTINST pThis)
+{
     /* Finally, clean up the critical section. */
     if (RTCritSectIsInitialized(&pThis->CritSect))
         RTCritSectDelete(&pThis->CritSect);
 
-    LogFunc(("Done\n"));
-}
-
-/**
- * @interface_method_impl{ATSTRANSPORT,pfnCreate}
- */
-static DECLCALLBACK(int) atsTcpCreate(PATSTRANSPORTINST *ppThis)
-{
-    PATSTRANSPORTINST pThis = (PATSTRANSPORTINST)RTMemAllocZ(sizeof(ATSTRANSPORTINST));
-    AssertPtrReturn(pThis, VERR_NO_MEMORY);
-
-    *ppThis = pThis;
-    return VINF_SUCCESS;
-}
-
-/**
- * @interface_method_impl{ATSTRANSPORT,pfnDestroy}
- */
-static DECLCALLBACK(int) atsTcpDestroy(PATSTRANSPORTINST pThis)
-{
-    /** @todo Anything else to do here? */
     RTMemFree(pThis);