Changeset 54515 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Feb 25, 2015 7:25:47 PM (10 years ago)

Author:

vboxsync

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

98625

Message:

SUPDrvGip.cpp: Re-enabled the clock tick sync code in supdrvInitRefineInvariantTscFreqTimer again, but with some precautions preventing us from spinning forever.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp

@@ -782 +782 @@
 
     /*
-     * Try get close to the next clock tick as usual.
+     * Read the TSC and time, noting which CPU we are on.
+     */
+    fEFlags = ASMIntDisableFlags();
+    uTsc    = ASMReadTSC();
+    nsNow   = RTTimeSystemNanoTS();
+    idCpu   = RTMpCpuId();
+    ASMSetFlags(fEFlags);
+
+    /*
+     * Try get close to the next clock tick if possible.  Don't try forever,
+     * we're in a timer.
      *
      * PORTME: If timers are called from the clock interrupt handler, or
@@ -799 +809 @@
      *      Timer callbacks are done in the clock interrupt, so skip it.
      */
-#if 0 /* Does this trigger the DPC watchdog? */
 #if !defined(RT_OS_OS2)
-    nsNow = RTTimeSystemNanoTS();
-    while (RTTimeSystemNanoTS() == nsNow)
-        ASMNopPause();
+    /** @todo r=bird: I believe this is a complete wast of time.  Where it
+     *        matters we cannot wait long enough (DPC watchdog will trigger)
+     *        and other platforms, we'll only skip a few ns that comes down
+     *        to rounding (not on windows 10 btw). */
+    if (nsNow == RTTimeSystemNanoTS())
+    {
+        uint32_t cTries = 0x10000;
+        while (cTries > 0)
+        {
+            ASMNopPause();
+            if (nsNow != RTTimeSystemNanoTS())
+            {
+                fEFlags = ASMIntDisableFlags();
+                uTsc    = ASMReadTSC();
+                nsNow   = RTTimeSystemNanoTS();
+                idCpu   = RTMpCpuId();
+                ASMSetFlags(fEFlags);
+                break;
+            }
+            ASMNopPause();
+            cTries--;
+        }
+# ifdef DEBUG
+        if (!cTries)
+            OSDBGPRINT(("supdrvInitRefineInvariantTscFreqTimer: Wasted %llu ticks waiting for the current timestamp to change...\n",
+                        ASMReadTSC() - uTsc));
+# endif
+    }
 #endif
-#endif
-
-    fEFlags = ASMIntDisableFlags();
-    uTsc    = ASMReadTSC();
-    nsNow   = RTTimeSystemNanoTS();
-    idCpu   = RTMpCpuId();
-    ASMSetFlags(fEFlags);
 
     cNsElapsed          = nsNow - pDevExt->nsStartInvarTscRefine;