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

Timestamp:

Dec 3, 2019 12:30:11 AM (5 years ago)

Author:

vboxsync

Message:

DevHDA: Reduce the number of PDMDevHlpTimerGet calls. bugref:9218

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (7 diffs)
• DevHDACommon.cpp (modified) (4 diffs)
• DevHDACommon.h (modified) (1 diff)
• HDAStream.cpp (modified) (6 diffs)
• HDAStream.h (modified) (1 diff)

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

@@ -1427 +1427 @@
                     AssertRC(rc2);
 
-                    rc2 = hdaR3TimerSet(pDevIns, pThis, pStream,
-                                          PDMDevHlpTimerGet(pDevIns, pThis->ahTimers[pStream->u8SD])
-                                        + pStream->State.cTransferTicks,
-                                        false /* fForce */);
+                    uint64_t const tsNow = PDMDevHlpTimerGet(pDevIns, pStream->hTimer);
+                    rc2 = hdaR3TimerSet(pDevIns, pStream, tsNow + pStream->State.cTransferTicks, false /* fForce */, tsNow);
                     AssertRC(rc2);
                 }
@@ -1521 +1519 @@
     HDA_PROCESS_INTERRUPT(pDevIns, pThis);
 
-    const uint64_t tsNow = PDMDevHlpTimerGet(pDevIns, pThis->ahTimers[uSD]);
+    const uint64_t tsNow = PDMDevHlpTimerGet(pDevIns, pStream->hTimer);
     Assert(tsNow >= pStream->State.tsTransferLast);
 
@@ -1547 +1545 @@
             LogRelMax2(64, ("HDA: Stream #%RU8 interrupt lagging behind (expected %uus, got %uus), trying to catch up ...\n",
                             pStream->u8SD,
-                            (PDMDevHlpTimerGetFreq(pDevIns, pThis->ahTimers[pStream->u8SD]) / pThis->uTimerHz) / 1000,
+                            (PDMDevHlpTimerGetFreq(pDevIns, pStream->hTimer) / pThis->uTimerHz) / 1000,
                             (tsNow - pStream->State.tsTransferLast) / 1000));
 
@@ -1568 +1566 @@
             /* Re-arm the timer. */
             LogFunc(("Timer set SD%RU8\n", pStream->u8SD));
-            hdaR3TimerSet(pDevIns, pThis, pStream, tsNow + cTicksToNext, false /* fForce */);
+            hdaR3TimerSet(pDevIns, pStream, tsNow + cTicksToNext, true /* fForce - we just set tsTransferNext*/, 0 /*tsNow*/);
         }
     }
@@ -2860 +2858 @@
     if (fSinkActive)
     {
-        const bool fTimerScheduled = hdaR3StreamTransferIsScheduled(pDevIns, pStream);
+        uint64_t const tsNow = PDMDevHlpTimerGet(pDevIns, hTimer); /* (For virtual sync this remains the same for the whole callout IIRC) */
+        const bool fTimerScheduled = hdaR3StreamTransferIsScheduled(pStream, tsNow);
         Log3Func(("fSinksActive=%RTbool, fTimerScheduled=%RTbool\n", fSinkActive, fTimerScheduled));
         if (!fTimerScheduled)
-            hdaR3TimerSet(pDevIns, pThis, pStream,
-                            PDMDevHlpTimerGet(pDevIns, hTimer)
-                          + PDMDevHlpTimerGetFreq(pDevIns, hTimer) / pStream->pHDAState->uTimerHz,
-                          true /* fForce */);
+            hdaR3TimerSet(pDevIns, pStream, tsNow + PDMDevHlpTimerGetFreq(pDevIns, hTimer) / pThis->uTimerHz,
+                          true /*fForce*/, tsNow /*fixed*/ );
     }
     else
@@ -2911 +2908 @@
     }
 
-    switch(enmAccessType)
+    switch (enmAccessType)
     {
         case PGMACCESSTYPE_WRITE:
@@ -3628 +3625 @@
                 hdaR3StreamRegisterDMAHandlers(pThis, pStream);
 #endif
-                if (hdaR3StreamTransferIsScheduled(pDevIns, pStream))
-                    hdaR3TimerSet(pDevIns, pThis, pStream, hdaR3StreamTransferGetNext(pStream), true /* fForce */);
+                if (hdaR3StreamTransferIsScheduled(pStream, PDMDevHlpTimerGet(pDevIns, pStream->hTimer)))
+                    hdaR3TimerSet(pDevIns, pStream, hdaR3StreamTransferGetNext(pStream), true /*fForce*/, 0 /*tsNow*/);
 
                 /* Also keep track of the currently active streams. */

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

@@ -665 +665 @@
  * @returns Whether the new expiration time was set or not.
  * @param   pDevIns     The device instance.
- * @param   pThis       HDA state.
  * @param   pStream     HDA stream to set timer for.
  * @param   tsExpire    New (virtual) expiration time to set.
  * @param   fForce      Whether to force setting the expiration time or not.
+ * @param   tsNow       The current clock timestamp if available, 0 if not.
  *
  * @remark  This function takes all active HDA streams and their
@@ -679 +679 @@
  *          Forcing a new expiration time will override the above mechanism.
  */
-bool hdaR3TimerSet(PPDMDEVINS pDevIns, PHDASTATE pThis, PHDASTREAM pStream, uint64_t tsExpire, bool fForce)
-{
-    AssertPtr(pThis);
+bool hdaR3TimerSet(PPDMDEVINS pDevIns, PHDASTREAM pStream, uint64_t tsExpire, bool fForce, uint64_t tsNow)
+{
     AssertPtr(pStream);
 
-    uint64_t tsExpireMin = tsExpire;
+    if (!tsNow)
+        tsNow = PDMDevHlpTimerGet(pDevIns, pStream->hTimer);
 
     if (!fForce)
@@ -691 +691 @@
          * PDMDevHlpTimerGet(), so, some callers does one, this does, and then we do
          * right afterwards == very inefficient! */
-        if (hdaR3StreamTransferIsScheduled(pDevIns, pStream))
+        if (hdaR3StreamTransferIsScheduled(pStream, tsNow))
         {
             uint64_t const tsNext = hdaR3StreamTransferGetNext(pStream);
-            if (tsExpireMin > tsNext)
-                tsExpireMin = tsNext;
+            if (tsExpire > tsNext)
+                tsExpire = tsNext;
         }
     }
-
-    const uint64_t tsNow = PDMDevHlpTimerGet(pDevIns, pStream->hTimer);
 
     /*
@@ -705 +703 @@
      * This in theory could happen in hdaR3StreamTransferGetNext() from above.
      */
-    if (tsExpireMin < tsNow)
-        tsExpireMin = tsNow;
-
-    int rc = PDMDevHlpTimerSet(pDevIns, pStream->hTimer, tsExpireMin);
+    if (tsExpire < tsNow)
+        tsExpire = tsNow;
+
+    int rc = PDMDevHlpTimerSet(pDevIns, pStream->hTimer, tsExpire);
     AssertRCReturn(rc, false);
 

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

@@ -653 +653 @@
  */
 #ifdef IN_RING3
-bool          hdaR3TimerSet(PPDMDEVINS pDevIns, PHDASTATE pThis, PHDASTREAM pStream, uint64_t u64Expire, bool fForce);
+bool          hdaR3TimerSet(PPDMDEVINS pDevIns, PHDASTREAM pStream, uint64_t u64Expire, bool fForce, uint64_t tsNow);
 #endif
 /** @} */

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

@@ -720 +720 @@
  *
  * @returns True if a next transfer is scheduled, false if not.
- * @param   pDevIns             The device instance.
  * @param   pStream             HDA stream to retrieve schedule status for.
- */
-bool hdaR3StreamTransferIsScheduled(PPDMDEVINS pDevIns, PHDASTREAM pStream)
+ * @param   tsNow               The current time.
+ */
+bool hdaR3StreamTransferIsScheduled(PHDASTREAM pStream, uint64_t tsNow)
 {
     if (pStream)
@@ -737 +737 @@
             }
 
-            const uint64_t tsNow = PDMDevHlpTimerGet(pDevIns, pStream->hTimer);
             if (pStream->State.tsTransferNext > tsNow)
             {
@@ -913 +912 @@
  * @param   pStream             HDA stream to update.
  * @param   cbToProcessMax      How much data (in bytes) to process as maximum.
- */
-int hdaR3StreamTransfer(PPDMDEVINS pDevIns, PHDASTREAM pStream, uint32_t cbToProcessMax)
+ * @param   fInTimer            Set if we're in the timer callout.
+ */
+static int hdaR3StreamTransfer(PPDMDEVINS pDevIns, PHDASTREAM pStream, uint32_t cbToProcessMax, bool fInTimer)
 {
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
@@ -1379 +1379 @@
 
         LogFunc(("Timer set SD%RU8\n", pStream->u8SD));
-        hdaR3TimerSet(pDevIns, pStream->pHDAState, pStream, tsTransferNext, false /* fForce */);
+        Assert(!fInTimer || tsNow == PDMDevHlpTimerGet(pDevIns, pStream->hTimer));
+        hdaR3TimerSet(pDevIns, pStream, tsTransferNext, true /* fForce - skip tsTransferNext check */, fInTimer ? tsNow : 0);
 
         pStream->State.tsTransferNext = tsTransferNext;
@@ -1450 +1451 @@
             {
                 /* Do the DMA transfer. */
-                rc2 = hdaR3StreamTransfer(pDevIns, pStream, cbStreamFree);
+                rc2 = hdaR3StreamTransfer(pDevIns, pStream, cbStreamFree, fInTimer);
                 AssertRC(rc2);
             }
@@ -1571 +1572 @@
             if (cbStreamUsed)
             {
-                rc2 = hdaR3StreamTransfer(pDevIns, pStream, cbStreamUsed);
+                rc2 = hdaR3StreamTransfer(pDevIns, pStream, cbStreamUsed, fInTimer);
                 AssertRC(rc2);
             }

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

@@ -272 +272 @@
 uint32_t          hdaR3StreamGetFree(PHDASTREAM pStream);
 uint32_t          hdaR3StreamGetUsed(PHDASTREAM pStream);
-bool              hdaR3StreamTransferIsScheduled(PPDMDEVINS pDevIns, PHDASTREAM pStream);
+bool              hdaR3StreamTransferIsScheduled(PHDASTREAM pStream, uint64_t tsNow);
 uint64_t          hdaR3StreamTransferGetNext(PHDASTREAM pStream);
-int               hdaR3StreamTransfer(PPDMDEVINS pDevIns, PHDASTREAM pStream, uint32_t cbToProcessMax);
 void              hdaR3StreamLock(PHDASTREAM pStream);
 void              hdaR3StreamUnlock(PHDASTREAM pStream);