Changeset 82332 in vbox for trunk/src/VBox/Devices/Audio/DevHDACommon.cpp

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Devices/Audio/DevHDACommon.cpp (modified) (4 diffs)

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);