Changeset 71704 in vbox

Timestamp:

Apr 6, 2018 12:52:24 PM (7 years ago)

Author:

vboxsync

Message:

DevHDA: hdaTimer + hdaStreamTransferIsScheduled: Please don't make unnecessary calls getting results you might not need. Things like TMTimerGet() can be expensive.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (1 diff)
• HDAStream.cpp (modified) (1 diff)

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

@@ -2796 +2796 @@
     /* Flag indicating whether to kick the timer again for a
      * new data processing round. */
-    const bool fSinkActive     = AudioMixerSinkIsActive(pStream->pMixSink->pMixSink);
-    const bool fTimerScheduled = hdaStreamTransferIsScheduled(pStream);
-
-    Log3Func(("fSinksActive=%RTbool, fTimerScheduled=%RTbool\n", fSinkActive, fTimerScheduled));
-
-    if (    fSinkActive
-        && !fTimerScheduled)
-    {
-        hdaTimerSet(pThis, pStream,
-                    TMTimerGet(pThis->pTimer[pStream->u8SD]) + TMTimerGetFreq(pThis->pTimer[pStream->u8SD]) / pStream->pHDAState->u16TimerHz,
-                    true /* fForce */);
-    }
+    const bool fSinkActive = AudioMixerSinkIsActive(pStream->pMixSink->pMixSink);
+    if (fSinkActive)
+    {
+        const bool fTimerScheduled = hdaStreamTransferIsScheduled(pStream);
+        Log3Func(("fSinksActive=%RTbool, fTimerScheduled=%RTbool\n", fSinkActive, fTimerScheduled));
+        if (!fTimerScheduled)
+            hdaTimerSet(pThis, pStream,
+                          TMTimerGet(pThis->pTimer[pStream->u8SD])
+                        + TMTimerGetFreq(pThis->pTimer[pStream->u8SD]) / pStream->pHDAState->u16TimerHz,
+                        true /* fForce */);
+    }
+    else
+        Log3Func(("fSinksActive=%RTbool\n", fSinkActive));
 
     DEVHDA_UNLOCK_BOTH(pThis, pStream->u8SD);

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

@@ -619 +619 @@
 bool hdaStreamTransferIsScheduled(PHDASTREAM pStream)
 {
-    if (!pStream)
-        return false;
-
-    AssertPtrReturn(pStream->pHDAState, false);
-
-    const uint64_t tsNow = TMTimerGet(pStream->pTimer);
-
-    const bool fScheduled =    pStream->State.fRunning
-                            && (   pStream->State.cTransferPendingInterrupts
-                                || pStream->State.tsTransferNext > tsNow);
-
-#ifdef LOG_ENABLED
-    if (fScheduled)
-    {
-        if (pStream->State.cTransferPendingInterrupts)
-            Log3Func(("[SD%RU8] Scheduled (%RU8 IRQs pending)\n",
-                      pStream->u8SD, pStream->State.cTransferPendingInterrupts));
-        else
-            Log3Func(("[SD%RU8] Scheduled in %RU64\n",
-                      pStream->u8SD, pStream->State.tsTransferNext - tsNow));
-    }
-#endif
-
-    return fScheduled;
+    if (pStream)
+    {
+        AssertPtrReturn(pStream->pHDAState, false);
+
+        if (pStream->State.fRunning)
+        {
+            if (pStream->State.cTransferPendingInterrupts)
+            {
+                Log3Func(("[SD%RU8] Scheduled (%RU8 IRQs pending)\n", pStream->u8SD, pStream->State.cTransferPendingInterrupts));
+                return true;
+            }
+
+            const uint64_t tsNow = TMTimerGet(pStream->pTimer);
+            if (pStream->State.tsTransferNext > tsNow)
+            {
+                Log3Func(("[SD%RU8] Scheduled in %RU64\n", pStream->u8SD, pStream->State.tsTransferNext - tsNow));
+                return true;
+            }
+        }
+    }
+    return false;
 }