Changeset 70405 in vbox

Timestamp:

Jan 1, 2018 5:45:14 PM (7 years ago)

Author:

vboxsync

Message:

IPRT/time-win.cpp: Use RtlGetInterruptTimePrecise for RTTimeSystemNanoTS when available (based on RDTSC) and using KUSER_SHARED_DATA from nt.h instead of duplicating it and its address.

Location:

trunk

Files:

• include/iprt/nt/nt.h (modified) (2 diffs)
• src/VBox/Runtime/r3/win/time-win.cpp (modified) (5 diffs)
• src/VBox/Runtime/testcase/tstTime-3.cpp (modified) (5 diffs)

trunk/include/iprt/nt/nt.h

@@ -677 +677 @@
     ULONG                   LangGenerationCount;                        /**< 0x3a4 */
     ULONGLONG               Reserved4;                                  /**< 0x3a8 */
-    ULONGLONG volatile      InterruptTimeBias;                          /**< 0x3b0 */
+    ULONGLONG volatile      InterruptTimeBias;                          /**< 0x3b0 - What QueryUnbiasedInterruptTimePrecise
+                                                                         * subtracts from interrupt time. */
     ULONGLONG volatile      QpcBias;                                    /**< 0x3b8 */
     ULONG volatile          ActiveProcessorCount;                       /**< 0x3c0 */
@@ -2813 +2814 @@
 NTSYSAPI uint64_t NTAPI RtlGetSystemTimePrecise(VOID);
 typedef uint64_t (NTAPI * PFNRTLGETSYSTEMTIMEPRECISE)(VOID);
+NTSYSAPI uint64_t NTAPI RtlGetInterruptTimePrecise(uint64_t *puPerfTime);
+typedef uint64_t (NTAPI * PFNRTLGETINTERRUPTTIMEPRECISE)(uint64_t *);
+NTSYSAPI BOOLEAN NTAPI RtlQueryUnbiasedInterruptTime(uint64_t *puInterruptTime);
+typedef BOOLEAN (NTAPI * PFNRTLQUERYUNBIASEDINTERRUPTTIME)(uint64_t *);
 
 RT_C_DECLS_END

trunk/src/VBox/Runtime/r3/win/time-win.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP RTLOGGROUP_TIME
-#include <iprt/win/windows.h>
+#include <iprt/nt/nt-and-windows.h>
 
 #include <iprt/time.h>
@@ -53 +53 @@
 //#endif
 
-
-#ifdef USE_INTERRUPT_TIME
-
-typedef struct _MY_KSYSTEM_TIME
-{
-    ULONG LowPart;
-    LONG High1Time;
-    LONG High2Time;
-} MY_KSYSTEM_TIME;
-
-typedef struct _MY_KUSER_SHARED_DATA
-{
-    ULONG TickCountLowDeprecated;
-    ULONG TickCountMultiplier;
-    volatile MY_KSYSTEM_TIME InterruptTime;
-    /* The rest is not relevant. */
-} MY_KUSER_SHARED_DATA, *PMY_KUSER_SHARED_DATA;
-
-#endif /* USE_INTERRUPT_TIME */
 
 
@@ -112 +93 @@
     /*
      * Use interrupt time if we can (not possible on NT 3.1).
+     * Note! We cannot entirely depend on g_enmWinVer here as we're likely to
+     *       get called before IPRT is initialized.  Ditto g_hModNtDll.
      */
-    /** @todo use RtlGetInterruptTimePrecise if available (W10+). */
-
-    static int volatile g_fCanUseUserSharedData = -1;
-    int fCanUseUserSharedData = g_fCanUseUserSharedData;
-    if (fCanUseUserSharedData != -1)
+    static PFNRTLGETINTERRUPTTIMEPRECISE    s_pfnRtlGetInterruptTimePrecise = NULL;
+    static int volatile                     s_iCanUseUserSharedData         = -1;
+    int                                     iCanUseUserSharedData           = s_iCanUseUserSharedData;
+    if (iCanUseUserSharedData != -1)
     { /* likely */ }
     else
@@ -123 +105 @@
         /* We may be called before g_enmWinVer has been initialized. */
         if (g_enmWinVer != kRTWinOSType_UNKNOWN)
-            fCanUseUserSharedData = g_enmWinVer > kRTWinOSType_NT310;
+            iCanUseUserSharedData = g_enmWinVer > kRTWinOSType_NT310;
         else
         {
             DWORD dwVer = GetVersion();
-            fCanUseUserSharedData = (dwVer & 0xff) != 3 || ((dwVer >> 8) & 0xff) >= 50;
+            iCanUseUserSharedData = (dwVer & 0xff) != 3 || ((dwVer >> 8) & 0xff) >= 50;
         }
-        g_fCanUseUserSharedData = fCanUseUserSharedData;
+        if (iCanUseUserSharedData != 0)
+        {
+            FARPROC pfn = GetProcAddress(g_hModNtDll ? g_hModNtDll : GetModuleHandleW(L"ntdll"), "RtlGetInterruptTimePrecise");
+            if (pfn != NULL)
+            {
+                ASMAtomicWritePtr(&s_pfnRtlGetInterruptTimePrecise, pfn);
+                iCanUseUserSharedData = 42;
+            }
+        }
+        s_iCanUseUserSharedData = iCanUseUserSharedData;
     }
 
-    if (fCanUseUserSharedData != 0)
+    if (iCanUseUserSharedData != 0)
     {
-        PMY_KUSER_SHARED_DATA pUserSharedData = (PMY_KUSER_SHARED_DATA)(uintptr_t)0x7ffe0000;
         LARGE_INTEGER Time;
-        do
+        if (iCanUseUserSharedData == 42)
         {
-            Time.HighPart = pUserSharedData->InterruptTime.High1Time;
-            Time.LowPart  = pUserSharedData->InterruptTime.LowPart;
-        } while (pUserSharedData->InterruptTime.High2Time != Time.HighPart);
+            uint64_t iIgnored;
+            Time.QuadPart = s_pfnRtlGetInterruptTimePrecise(&iIgnored);
+        }
+        else
+        {
+            PKUSER_SHARED_DATA pUserSharedData = (PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA;
+            do
+            {
+                Time.HighPart = pUserSharedData->InterruptTime.High1Time;
+                Time.LowPart  = pUserSharedData->InterruptTime.LowPart;
+            } while (pUserSharedData->InterruptTime.High2Time != Time.HighPart);
+        }
 
         return (uint64_t)Time.QuadPart * 100;

trunk/src/VBox/Runtime/testcase/tstTime-3.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#ifdef RT_OS_WINDOWS
-# include <iprt/win/windows.h>
-
-#else /* posix */
-# include <sys/time.h>
-#endif
-
 #include <iprt/time.h>
 #include <iprt/stream.h>
@@ -42 +35 @@
 #include <iprt/thread.h>
 #include <iprt/err.h>
-
-
-DECLINLINE(uint64_t) OSNanoTS(void)
-{
-#ifdef RT_OS_WINDOWS
-    uint64_t u64; /* manual say larger integer, should be safe to assume it's the same. */
-    GetSystemTimeAsFileTime((LPFILETIME)&u64);
-    return u64 * 100;
-
-#else /* posix */
-
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (uint64_t)tv.tv_sec  * (uint64_t)(1000 * 1000 * 1000)
-         + (uint64_t)(tv.tv_usec * 1000);
-#endif
-}
 
 
@@ -72 +48 @@
     }
 
-    RTPrintf("tstTime-3: Testing difference between RTTimeNanoTS() and OS time...\n");
+    RTPrintf("tstTime-3: Testing difference between RTTimeNanoTS() and RTTimeSystemNanoTS()...\n");
 
     for (int i = 1; i < argc; i++)
@@ -85 +61 @@
         RTPrintf("tstTime-3: %d - %RU64 seconds period...\n", i, cSeconds);
 
-        RTTimeNanoTS(); OSNanoTS(); RTThreadSleep(1);
+        RTTimeNanoTS(); RTTimeSystemNanoTS(); RTThreadSleep(1);
         uint64_t u64RTStartTS = RTTimeNanoTS();
-        uint64_t u64OSStartTS = OSNanoTS();
+        uint64_t u64OSStartTS = RTTimeSystemNanoTS();
 
         RTThreadSleep(cSeconds * 1000);
@@ -103 +79 @@
     return 0;
 }
+