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

Timestamp:

May 25, 2021 8:11:23 PM (4 years ago)

Author:

vboxsync

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

144628

Message:

DrvAudio: A couple of fixes related to multi-threading. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (4 diffs)

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

@@ -2213 +2213 @@
                 Assert(pStreamEx->cRefs >= 2);
                 int rc2 = RTReqCancel(pStreamEx->hReqInitAsync);
+
+                RTReqRelease(pStreamEx->hReqInitAsync);
+                pStreamEx->hReqInitAsync = NIL_RTREQ;
+
+                RTCritSectLeave(&pStreamEx->Core.CritSect); /* (exit before releasing the stream to avoid assertion) */
+
                 if (RT_SUCCESS(rc2))
                 {
@@ -2225 +2231 @@
                     Assert(rc2 == VERR_RT_REQUEST_STATE);
                 }
-
-                RTReqRelease(pStreamEx->hReqInitAsync);
-                pStreamEx->hReqInitAsync = NIL_RTREQ;
             }
-
-            RTCritSectLeave(&pStreamEx->Core.CritSect);
+            else
+                RTCritSectLeave(&pStreamEx->Core.CritSect);
 
             /*
@@ -4131 +4134 @@
     AssertRCReturn(rc, rc);
 
-    AssertPtr(pThis->hReqPool != NIL_RTREQPOOL);
+    Assert(pThis->hReqPool != NIL_RTREQPOOL);
     AssertPtr(pThis->pHostDrvAudio);
     if (   pThis->hReqPool != NIL_RTREQPOOL
         && pThis->pHostDrvAudio != NULL)
     {
-        Assert(pThis->pHostDrvAudio->pfnDoOnWorkerThread);
+        AssertPtr(pThis->pHostDrvAudio->pfnDoOnWorkerThread);
         if (pThis->pHostDrvAudio->pfnDoOnWorkerThread)
         {
@@ -4150 +4153 @@
             else
             {
-
                 uint32_t cRefs = drvAudioStreamRetainInternal(pStreamEx);
                 if (cRefs != UINT32_MAX)