Changeset 54215 in vbox for trunk

Timestamp:

Feb 16, 2015 12:33:36 PM (10 years ago)

Author:

vboxsync

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

98279

Message:

Runtime,TM: Use GIP's fTscDeltasAreRoughlyInSync.

Location:

trunk

Files:

• include/VBox/sup.h (modified) (2 diffs)
• src/VBox/Runtime/common/time/timesup.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/TM.cpp (modified) (2 diffs)

trunk/include/VBox/sup.h

@@ -439 +439 @@
     ((a_pGip)->u32Mode == SUPGIPMODE_INVARIANT_TSC && !((a_pGip)->fOsTscDeltasInSync))
 
+/** Whether the application of TSC-deltas are worth it (performance matters). */
+#define GIP_TSC_DELTAS_ROUGHLY_IN_SYNC(a_pGip)         ((a_pGip)->fTscDeltasRoughlyInSync)
+
 #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
 /**
@@ -1649 +1652 @@
 DECLINLINE(uint64_t) SUPReadTsc(void)
 {
-    if (GIP_ARE_TSC_DELTAS_APPLICABLE(g_pSUPGlobalInfoPage))
+    if (    GIP_ARE_TSC_DELTAS_APPLICABLE(g_pSUPGlobalInfoPage)
+        && !GIP_TSC_DELTAS_ROUGHLY_IN_SYNC(g_pSUPGlobalInfoPage))
     {
         uint64_t u64Tsc = UINT64_MAX;

trunk/src/VBox/Runtime/common/time/timesup.cpp

@@ -160 +160 @@
  * @returns true if deltas needs to be applied, false if not.
  * @param   pGip                The GIP.
+ *
+ * @remarks If you change this, make sure to also change tmR3ReallyNeedDeltas().
  */
 static bool rtTimeNanoTsInternalReallyNeedDeltas(PSUPGLOBALINFOPAGE pGip)
 {
+    return !pGip->fOsTscDeltasInSync && !pGip->fTscDeltasRoughlyInSync;
+#if 0
     if (!pGip->fOsTscDeltasInSync)
     {
@@ -173 +177 @@
     }
     return false;
+#endif
 }
 

trunk/src/VBox/VMM/VMMR3/TM.cpp

@@ -952 +952 @@
  * @returns true if deltas needs to be applied, false if not.
  * @param   pGip                The GIP.
+ *
+ * @remarks If you change this, make sure to also change
+ *          rtTimeNanoTsInternalReallyNeedDeltas().
  */
 static bool tmR3ReallyNeedDeltas(PSUPGLOBALINFOPAGE pGip)
 {
+    return !pGip->fOsTscDeltasInSync && !pGip->fTscDeltasRoughlyInSync;
+#if 0
     if (!pGip->fOsTscDeltasInSync)
     {
@@ -965 +970 @@
     }
     return false;
+#endif
 }