Changeset 89844 in vbox

Timestamp:

Jun 23, 2021 8:23:40 AM (4 years ago)

Author:

vboxsync

Message:

DevHda: Eliminated HDASTREAM::CritSect as it is not necessary. The AIO thread serialization happens via the sink lock, the rest via the device wide critical section. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHda.cpp (modified) (12 diffs)
• DevHdaStream.cpp (modified) (8 diffs)
• DevHdaStream.h (modified) (3 diffs)

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

@@ -1333 +1333 @@
 
         STAM_REL_PROFILE_START_NS(&pStreamR3->State.StatReset, a);
-        hdaStreamLock(pStreamShared);
+        Assert(PDMCritSectIsOwner(&pThis->CritSect));
         PAUDMIXSINK const pMixSink = pStreamR3->pMixSink ? pStreamR3->pMixSink->pMixSink : NULL;
         if (pMixSink)
@@ -1350 +1350 @@
         if (pMixSink) /* (FYI. pMixSink might not be what pStreamR3->pMixSink->pMixSink points at any longer) */
             AudioMixerSinkUnlock(pMixSink);
-        hdaStreamUnlock(pStreamShared);
         STAM_REL_PROFILE_STOP_NS(&pStreamR3->State.StatReset, a);
     }
@@ -1364 +1363 @@
             LogFunc(("[SD%RU8] State changed (fRun=%RTbool)\n", uSD, fRun));
 
-            hdaStreamLock(pStreamShared);
+            Assert(PDMCritSectIsOwner(&pThis->CritSect));
             /** @todo bird: It's not clear to me when the pMixSink is actually
              *        assigned to the stream, so being paranoid till I find out... */
@@ -1462 +1461 @@
             if (pMixSink)
                 AudioMixerSinkUnlock(pMixSink);
-            hdaStreamUnlock(pStreamShared);
             STAM_REL_PROFILE_STOP_NS((fRun ? &pStreamR3->State.StatStart : &pStreamR3->State.StatStop), r);
         }
@@ -2520 +2518 @@
             LogFunc(("Sink '%s' was assigned to stream #%RU8 (channel %RU8) before\n",
                      pSink->pMixSink->pszName, pOldStreamShared->u8SD, pOldStreamShared->u8Channel));
-
-            hdaStreamLock(pOldStreamShared);
+            Assert(PDMCritSectIsOwner(&pThis->CritSect));
 
             /* Only disable the stream if the stream descriptor # has changed. */
@@ -2535 +2532 @@
             pOldStreamR3->pMixSink = NULL;
 
-            hdaStreamUnlock(pOldStreamShared);
 
             pSink->pStreamShared = NULL;
@@ -2550 +2546 @@
             PHDASTREAMR3 pStreamR3     = &pThisCC->aStreams[uSD];
             PHDASTREAM   pStreamShared = &pThis->aStreams[uSD];
-            hdaStreamLock(pStreamShared);
+            Assert(PDMCritSectIsOwner(&pThis->CritSect));
 
             pSink->pStreamR3     = pStreamR3;
@@ -2558 +2554 @@
             pStreamR3->pMixSink      = pSink;
 
-            hdaStreamUnlock(pStreamShared);
             rc = VINF_SUCCESS;
         }
@@ -2765 +2760 @@
 {
     LogFlowFuncEnter();
+    Assert(PDMCritSectIsOwner(&pThis->CritSect));
 
     /*
@@ -2774 +2770 @@
         PHDASTREAM const   pStreamShared = &pThis->aStreams[idxStream];
         PHDASTREAMR3 const pStreamR3     = &pThisCC->aStreams[idxStream];
-        hdaStreamLock(pStreamShared);
         PAUDMIXSINK const pMixSink = pStreamR3->pMixSink ? pStreamR3->pMixSink->pMixSink : NULL;
         if (pMixSink)
@@ -2789 +2784 @@
         if (pMixSink) /* (FYI. pMixSink might not be what pStreamR3->pMixSink->pMixSink points at any longer) */
             AudioMixerSinkUnlock(pMixSink);
-        hdaStreamUnlock(pStreamShared);
     }
 
@@ -4592 +4586 @@
 
     for (uint8_t i = 0; i < HDA_MAX_STREAMS; i++)
-        hdaR3StreamDestroy(&pThis->aStreams[i], &pThisCC->aStreams[i]);
+        hdaR3StreamDestroy(&pThisCC->aStreams[i]);
 
     /* We don't always go via PowerOff, so make sure the mixer is destroyed. */

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

@@ -64 +64 @@
 int hdaR3StreamConstruct(PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3, PHDASTATE pThis, PHDASTATER3 pThisCC, uint8_t uSD)
 {
-    int rc;
-
     pStreamR3->u8SD             = uSD;
     pStreamShared->u8SD         = uSD;
@@ -81 +79 @@
     AssertPtr(pStreamR3->pHDAStateR3);
     AssertPtr(pStreamR3->pHDAStateR3->pDevIns);
-    rc = PDMDevHlpCritSectInit(pStreamR3->pHDAStateR3->pDevIns, &pStreamShared->CritSect,
-                               RT_SRC_POS, "hda_sd#%RU8", pStreamShared->u8SD);
-    AssertRCReturn(rc, rc);
 
 #ifdef DEBUG
-    rc = RTCritSectInit(&pStreamR3->Dbg.CritSect);
+    int rc = RTCritSectInit(&pStreamR3->Dbg.CritSect);
     AssertRCReturn(rc, rc);
 #endif
@@ -155 +150 @@
     }
 
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -164 +159 @@
  * @param   pStreamR3           The HDA stream to destroy - ring-3 bits.
  */
-void hdaR3StreamDestroy(PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3)
-{
-    LogFlowFunc(("[SD%RU8] Destroying ...\n", pStreamShared->u8SD));
+void hdaR3StreamDestroy(PHDASTREAMR3 pStreamR3)
+{
+    LogFlowFunc(("[SD%RU8] Destroying ...\n", pStreamR3->u8SD));
     int rc2;
 
@@ -174 +169 @@
         AssertRC(rc2);
         pStreamR3->State.pAioRegSink = NULL;
-    }
-
-    if (PDMCritSectIsInitialized(&pStreamShared->CritSect))
-    {
-        rc2 = PDMR3CritSectDelete(&pStreamShared->CritSect);
-        AssertRC(rc2);
     }
 
@@ -1991 +1980 @@
          * Do the DMA transfer.
          */
-        rc2 = PDMDevHlpCritSectEnter(pDevIns, &pStreamShared->CritSect, VERR_IGNORED);
-        AssertRC(rc2);
-
         uint64_t const offWriteBefore = pStreamR3->State.offWrite;
         hdaR3StreamDoDmaOutput(pDevIns, pThis, pStreamShared, pStreamR3, RT_MIN(cbStreamFree, cbPeriod), tsNowNs);
-
-        rc2 = PDMDevHlpCritSectLeave(pDevIns, &pStreamShared->CritSect);
-        AssertRC(rc2);
 
         /*
@@ -2154 +2137 @@
          */
         if (cbStreamUsed)
-        {
-            rc2 = PDMDevHlpCritSectEnter(pDevIns, &pStreamShared->CritSect, VERR_IGNORED);
-            AssertRC(rc2);
-
             hdaR3StreamDoDmaInput(pDevIns, pThis, pStreamShared, pStreamR3,
                                   RT_MIN(cbStreamUsed, cbPeriod), fWriteSilence, tsNowNs);
-
-            rc2 = PDMDevHlpCritSectLeave(pDevIns, &pStreamShared->CritSect);
-            AssertRC(rc2);
-        }
 
         /*
@@ -2222 +2197 @@
 }
 
-#endif /* IN_RING3 */
-
-/**
- * Locks an HDA stream for serialized access.
- *
- * @returns VBox status code.
- * @param   pStreamShared       HDA stream to lock (shared bits).
- */
-void hdaStreamLock(PHDASTREAM pStreamShared)
-{
-    AssertPtrReturnVoid(pStreamShared);
-    int rc2 = PDMCritSectEnter(&pStreamShared->CritSect, VINF_SUCCESS);
-    AssertRC(rc2);
-}
-
-/**
- * Unlocks a formerly locked HDA stream.
- *
- * @returns VBox status code.
- * @param   pStreamShared       HDA stream to unlock (shared bits).
- */
-void hdaStreamUnlock(PHDASTREAM pStreamShared)
-{
-    AssertPtrReturnVoid(pStreamShared);
-    int rc2 = PDMCritSectLeave(&pStreamShared->CritSect);
-    AssertRC(rc2);
-}
-
-#ifdef IN_RING3
 
 #if 0 /* unused - no prototype even */

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

@@ -238 +238 @@
     /** Pad the structure size to a 64 byte alignment. */
     uint64_t                    au64Padding1[2];
-    /** Critical section for serialize access to the stream state between the async
-     * I/O thread and (basically) the guest. */
-    PDMCRITSECT                 CritSect;
 } HDASTREAM;
 AssertCompileMemberAlignment(HDASTREAM, State.aBdl, 16);
@@ -307 +304 @@
 typedef HDASTREAMR3 *PHDASTREAMR3;
 
-/** @name Stream functions (shared).
- * @{
- */
-void                hdaStreamLock(PHDASTREAM pStreamShared);
-void                hdaStreamUnlock(PHDASTREAM pStreamShared);
-/** @} */
-
 #ifdef IN_RING3
 
@@ -321 +311 @@
 int                 hdaR3StreamConstruct(PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3, PHDASTATE pThis,
                                          PHDASTATER3 pThisCC, uint8_t uSD);
-void                hdaR3StreamDestroy(PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3);
+void                hdaR3StreamDestroy(PHDASTREAMR3 pStreamR3);
 int                 hdaR3StreamSetUp(PPDMDEVINS pDevIns, PHDASTATE pThis, PHDASTREAM pStreamShared,
                                      PHDASTREAMR3 pStreamR3, uint8_t uSD);