Changeset 54224 in vbox for trunk/src/VBox/Runtime

Timestamp:

Feb 16, 2015 10:41:32 PM (10 years ago)

Author:

vboxsync

Message:

SUP,IPRT: Started as a build fix ended up as a cleanup (mostly untested as I'm windows). We'll keep SUP_IOCTL_TSC_READ for the purpose of dealing with the i64TSCDelta == INT64_MAX in SUPReadTsc/SUPReadTscWithDelta. Moved the excessive inline code from sup.h to SUPLibAll.cpp (new file) and SUPDrv.c (apply delta). Don't bother too much about trying to share code between SUPLibAll.cpp and SUPDrv.c/++ as the SUPReadTsc[WithDelta] scenario does not care about knowing when things goes bad, it just needs a TSC that is as good as we can get. The SUPDrv.c code on the other hand probably needs other kind of status codes, assertions and whatnot to be better off with its own version of the code. Remove the now unused assembly macro for applying the delta - the way the delta is applied will not change, period, so better just document it instead.

File:

• trunk/src/VBox/Runtime/common/time/timesup.cpp (modified) (2 diffs)

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

@@ -153 +153 @@
 
 /**
- * Checks if we really need to apply the delta values.
- *
- * Getting the delta for a CPU is _very_ expensive, it more than doubles the
- * execution time for RTTimeNanoTS.
- *
- * @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)
-    {
-        uint32_t i = pGip->cCpus;
-        while (i-- > 0)
-            if (   pGip->aCPUs[i].enmState == SUPGIPCPUSTATE_ONLINE
-                && (   pGip->aCPUs[i].i64TSCDelta > 384
-                    || pGip->aCPUs[i].i64TSCDelta < -384) )
-                return true;
-    }
-    return false;
-#endif
-}
-
-
-/**
  * Called the first time somebody asks for the time or when the GIP
  * is mapped/unmapped.
@@ -197 +168 @@
         if (ASMCpuId_EDX(1) & X86_CPUID_FEATURE_EDX_SSE2)
             iWorker = pGip->u32Mode == SUPGIPMODE_INVARIANT_TSC
-                    ? rtTimeNanoTsInternalReallyNeedDeltas(pGip)
+                    ? !pGip->fOsTscDeltasInSync && !pGip->fTscDeltasRoughlyInSync
                       ? RTTIMENANO_WORKER_LFENCE_INVAR_WITH_DELTA : RTTIMENANO_WORKER_LFENCE_INVAR_NO_DELTA
                     : pGip->u32Mode == SUPGIPMODE_SYNC_TSC
-                    ? false /** @todo !rtTimeNanoTsInternalReallyNeedDeltas(pGip) */
+                    ? false /** @todo !pGip->fOsTscDeltasInSync && !pGip->fTscDeltasRoughlyInSync */
                       ? RTTIMENANO_WORKER_LFENCE_SYNC_WITH_DELTA  : RTTIMENANO_WORKER_LFENCE_SYNC_NO_DELTA
                     : RTTIMENANO_WORKER_LFENCE_ASYNC;
         else
             iWorker = pGip->u32Mode == SUPGIPMODE_INVARIANT_TSC
-                    ? rtTimeNanoTsInternalReallyNeedDeltas(pGip)
+                    ? !pGip->fOsTscDeltasInSync && !pGip->fTscDeltasRoughlyInSync
                       ? RTTIMENANO_WORKER_LEGACY_INVAR_WITH_DELTA : RTTIMENANO_WORKER_LEGACY_INVAR_NO_DELTA
                     : pGip->u32Mode == SUPGIPMODE_SYNC_TSC
-                    ? false /** @todo rtTimeNanoTsInternalReallyNeedDeltas(pGip) */
+                    ? false /** @todo !pGip->fOsTscDeltasInSync && !pGip->fTscDeltasRoughlyInSync */
                       ? RTTIMENANO_WORKER_LEGACY_SYNC_WITH_DELTA  : RTTIMENANO_WORKER_LEGACY_SYNC_NO_DELTA
                     : RTTIMENANO_WORKER_LEGACY_ASYNC;