Changeset 82420 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 5, 2019 1:51:16 PM (5 years ago)

Author:

vboxsync

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

135257

Message:

DevHDA: The HDASTREAM::CritSect is not needed unless VBOX_WITH_AUDIO_HDA_ASYNC_IO is defined, the critical section of the device will take care of the serializing then. The hdaR3StreamLock/Unlock functions are left as no-ops (strict builds checks for device critsect ownership). bugref:9218

Location:

trunk/src/VBox/Devices/Audio

Files:

• HDAStream.cpp (modified) (6 diffs)
• HDAStream.h (modified) (1 diff)

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

@@ -48 +48 @@
 int hdaR3StreamCreate(PHDASTREAM pStream, PHDASTATE pThis, uint8_t u8SD)
 {
+    int rc;
     RT_NOREF(pThis);
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
@@ -62 +63 @@
 #endif
 
-    int rc = RTCritSectInit(&pStream->CritSect);
+# ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
+    rc = RTCritSectInit(&pStream->CritSect);
     AssertRCReturn(rc, rc);
+# endif
 
     rc = hdaR3StreamPeriodCreate(&pStream->State.Period);
@@ -146 +149 @@
 #endif
 
+# ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
     if (RTCritSectIsInitialized(&pStream->CritSect))
     {
@@ -151 +155 @@
         AssertRC(rc2);
     }
+# endif
 
     if (pStream->State.pCircBuf)
@@ -1589 +1594 @@
 {
     AssertPtrReturnVoid(pStream);
+# ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
     int rc2 = RTCritSectEnter(&pStream->CritSect);
     AssertRC(rc2);
+# else
+    Assert(PDMDevHlpCritSectIsOwner(pStream->pHDAState->pDevInsR3, pStream->pHDAState->CritSect));
+# endif
 }
 
@@ -1602 +1611 @@
 {
     AssertPtrReturnVoid(pStream);
+# ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
     int rc2 = RTCritSectLeave(&pStream->CritSect);
     AssertRC(rc2);
+# endif
 }
 

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

@@ -238 +238 @@
     /** The timer for pumping data thru the attached LUN drivers. */
     TMTIMERHANDLE               hTimer;
-    /** The stream'S critical section to serialize access. */
+#ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
+    /** The stream's critical section to serialize access between the async I/O
+     *  thread and (basically) the guest. */
     RTCRITSECT                  CritSect;
+#endif
     /** Internal state of this stream. */
     HDASTREAMSTATE              State;