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

Timestamp:

Aug 31, 2016 9:32:01 AM (8 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Renamed drvAudioStreamDestroyInternal() -> drvAudioStreamUninitInternal() and made the stream destruction independent of that function. Added a couple more (verbose) release logging / assertions.

File:

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

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

@@ -44 +44 @@
 static int drvAudioStreamControlInternalBackend(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd);
 static int drvAudioStreamControlInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd);
-static int drvAudioStreamDestroyInternalBackend(PDRVAUDIO pThis, PPDMAUDIOSTREAM pHstStream);
-static int drvAudioStreamDestroyInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream);
+static int drvAudioStreamDestroyInBackendInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pHstStream);
+static int drvAudioStreamUninitInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream);
 static int drvAudioStreamInitInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgHost, PPDMAUDIOSTREAMCFG pCfgGuest);
 static int drvAudioStreamIterateInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream);
@@ -150 +150 @@
     if (pHstStream)
     {
-        Assert(pHstStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
+        AssertReleaseMsg(pHstStream->enmCtx == PDMAUDIOSTREAMCTX_HOST,
+                         ("Stream '%s' resolved as host part is not marked as such (enmCtx=%RU32)\n",
+                          pHstStream->szName, pHstStream->enmCtx));
+
+        AssertReleaseMsg(pHstStream->pPair != NULL,
+                         ("Stream '%s' resolved as host part has no guest part (anymore)\n", pHstStream->szName));
     }
     else
-        LogFlowFunc(("%s: Warning: Does not have a host stream (anymore)\n", pStream->szName));
+        AssertReleaseMsgFailed(("Stream '%s' does not have a host pair (anymore)\n",
+                                pStream->szName));
 
     return pHstStream;
@@ -528 +534 @@
     DrvAudioHlpStreamCfgPrint(pCfgHost);
 #else
+    LogRel2(("Audio: Creating stream '%s'\n", pStream->szName));
     LogRel2(("Audio: Requested %s host format for '%s': %RU32Hz, %s, %RU8 %s\n",
-             pCfgGuest->enmDir == PDMAUDIODIR_IN ? "recording" : "playback",  pStream->szName,
+             pCfgGuest->enmDir == PDMAUDIODIR_IN ? "recording" : "playback", pStream->szName,
              pCfgHost->uHz, DrvAudioHlpAudFmtToStr(pCfgHost->enmFormat),
              pCfgHost->cChannels, pCfgHost->cChannels == 0 ? "Channel" : "Channels"));
@@ -538 +545 @@
     if (RT_FAILURE(rc))
     {
-        LogFlowFunc(("[%s] Initializing stream in host backend failed with rc=%Rrc\n", pStream->szName, rc));
+        LogRel2(("Audio: Creating stream '%s' in backend failed with %Rrc\n", pStream->szName, rc));
         return rc;
     }
@@ -639 +646 @@
     /* Make a copy of the host stream configuration. */
     memcpy(&pGstStream->Cfg, pCfgGuest, sizeof(PDMAUDIOSTREAMCFG));
+
+    if (RT_FAILURE(rc))
+        LogRel2(("Audio: Creating stream '%s' failed with %Rrc\n", pStream->szName, rc));
 
     LogFlowFunc(("[%s] Returning %Rrc\n", pStream->szName, rc));
@@ -1445 +1455 @@
     AssertPtrReturn(pDrvIns,    VERR_INVALID_POINTER);
 
+    LogRel2(("Audio: Verbose logging enabled\n"));
+
     PDRVAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIO);
     LogFlowFunc(("pThis=%p, pDrvIns=%p\n", pThis, pDrvIns));
@@ -1687 +1699 @@
         if (pGstStrm)
         {
-            drvAudioStreamDestroyInternal(pThis, pGstStrm);
-            pGstStrm = NULL;
+            int rc2 = drvAudioStreamUninitInternal(pThis, pGstStrm);
+            if (RT_SUCCESS(rc2))
+            {
+                RTMemFree(pGstStrm);
+                pGstStrm = NULL;
+            }
         }
 
         if (pHstStrm)
         {
-            drvAudioStreamDestroyInternal(pThis, pHstStrm);
-            pHstStrm = NULL;
+            int rc2 = drvAudioStreamUninitInternal(pThis, pHstStrm);
+            if (RT_SUCCESS(rc2))
+            {
+                RTMemFree(pHstStrm);
+                pHstStrm = NULL;
+            }
         }
     }
@@ -1946 +1966 @@
         PPDMAUDIOSTREAM pGstStream = pHstStream ? pHstStream->pPair : pStream;
 
-        LogFlowFunc(("\tHost : %s\n", pHstStream ? pHstStream->szName : "<None>"));
-        LogFlowFunc(("\tGuest: %s\n", pGstStream ? pGstStream->szName : "<None>"));
+        LogRel2(("Audio: Destroying host stream '%s' (guest stream '%s')\n",
+                 pHstStream ? pHstStream->szName : "<None>",
+                 pGstStream ? pGstStream->szName : "<None>"));
 
         /* Should prevent double frees. */
@@ -1954 +1975 @@
         if (pHstStream)
         {
-            pHstStream->pPair = NULL;
-            RTListNodeRemove(&pHstStream->Node);
-        }
-
-        if (pGstStream)
-        {
-            pGstStream->pPair = NULL;
-            RTListNodeRemove(&pGstStream->Node);
-        }
-
-        if (pHstStream)
-        {
-            rc = drvAudioStreamDestroyInternal(pThis, pHstStream);
-            AssertRC(rc);
-
-            pHstStream = NULL;
-        }
-
-        if (pGstStream)
-        {
-            rc = drvAudioStreamDestroyInternal(pThis, pGstStream);
-            AssertRC(rc);
-
-            pGstStream = NULL;
+            rc = drvAudioStreamUninitInternal(pThis, pHstStream);
+            if (RT_SUCCESS(rc))
+            {
+                RTListNodeRemove(&pHstStream->Node);
+
+                RTMemFree(pHstStream);
+                pHstStream = NULL;
+            }
+            else
+                LogRel2(("Audio: Uninitializing host stream '%s' failed with %Rrc\n", pHstStream->szName, rc));
+        }
+
+        if (   RT_SUCCESS(rc)
+            && pGstStream)
+        {
+            rc = drvAudioStreamUninitInternal(pThis, pGstStream);
+            if (RT_SUCCESS(rc))
+            {
+                RTListNodeRemove(&pGstStream->Node);
+
+                RTMemFree(pGstStream);
+                pGstStream = NULL;
+            }
+            else
+                LogRel2(("Audio: Uninitializing guest stream '%s' failed with %Rrc\n", pGstStream->szName, rc));
         }
     }
@@ -2008 +2030 @@
  * @param   pHstStream          Host audio stream to call the backend destruction for.
  */
-static int drvAudioStreamDestroyInternalBackend(PDRVAUDIO pThis, PPDMAUDIOSTREAM pHstStream)
+static int drvAudioStreamDestroyInBackendInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pHstStream)
 {
     AssertPtrReturn(pThis,      VERR_INVALID_POINTER);
@@ -2035 +2057 @@
 
 /**
- * Destroys an audio stream.
+ * Uninitializes an audio stream.
  *
  * @returns IPRT status code.
  * @param   pThis               Pointer to driver instance.
- * @param   pStream             Pointer to audio stream to destroy.
- *                              That pointer will be invalid after successful destruction.
- */
-static int drvAudioStreamDestroyInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream)
+ * @param   pStream             Pointer to audio stream to uninitialize.
+ */
+static int drvAudioStreamUninitInternal(PDRVAUDIO pThis, PPDMAUDIOSTREAM pStream)
 {
     AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
@@ -2080 +2101 @@
     else if (pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST)
     {
-        rc = drvAudioStreamDestroyInternalBackend(pThis, pStream);
+        rc = drvAudioStreamDestroyInBackendInternal(pThis, pStream);
 
         if (pStream->enmDir == PDMAUDIODIR_IN)
@@ -2100 +2121 @@
     if (RT_SUCCESS(rc))
     {
+        /* Make sure that the pair (if any) knows that we're not valid anymore. */
+        if (pStream->pPair)
+            pStream->pPair->pPair = NULL;
+
+        /* Reset status. */
+        pStream->fStatus = PDMAUDIOSTRMSTS_FLAG_NONE;
+
+        /* Clear name. */
+        pStream->szName[0] = '\0';
+
         /* Destroy mixing buffer. */
         AudioMixBufDestroy(&pStream->MixBuf);
-
-        if (pStream)
-        {
-            RTMemFree(pStream);
-            pStream = NULL;
-        }
     }
 
@@ -2148 +2173 @@
     PPDMAUDIOSTREAM pStream;
     RTListForEach(&pThis->lstHstStreams, pStream, PDMAUDIOSTREAM, Node)
-        drvAudioStreamDestroyInternalBackend(pThis, pStream);
+        drvAudioStreamDestroyInBackendInternal(pThis, pStream);
 
     /*
@@ -2283 +2308 @@
     PPDMAUDIOSTREAM pStream, pStreamNext;
     RTListForEachSafe(&pThis->lstHstStreams, pStream, pStreamNext, PDMAUDIOSTREAM, Node)
-        drvAudioStreamDestroyInternal(pThis, pStream);
+    {
+        rc2 = drvAudioStreamUninitInternal(pThis, pStream);
+        if (RT_SUCCESS(rc2))
+        {
+            RTListNodeRemove(&pStream->Node);
+
+            RTMemFree(pStream);
+            pStream = NULL;
+        }
+    }
+
+    /* Sanity. */
+    Assert(RTListIsEmpty(&pThis->lstHstStreams));
 
     RTListForEachSafe(&pThis->lstGstStreams, pStream, pStreamNext, PDMAUDIOSTREAM, Node)
-        drvAudioStreamDestroyInternal(pThis, pStream);
+    {
+        rc2 = drvAudioStreamUninitInternal(pThis, pStream);
+        if (RT_SUCCESS(rc2))
+        {
+            RTListNodeRemove(&pStream->Node);
+
+            RTMemFree(pStream);
+            pStream = NULL;
+        }
+    }
+
+    /* Sanity. */
+    Assert(RTListIsEmpty(&pThis->lstGstStreams));
 
 #ifdef VBOX_WITH_AUDIO_CALLBACKS