Changeset 53456 in vbox

Timestamp:

Dec 5, 2014 12:52:46 PM (10 years ago)

Author:

vboxsync

Message:

RTTime/r0drv/nt: Use higher precision APIs to get times when available.

Location:

trunk/src/VBox/Runtime/r0drv/nt

Files:

• initterm-r0drv-nt.cpp (modified) (4 diffs)
• internal-r0drv-nt.h (modified) (1 diff)
• time-r0drv-nt.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp

@@ -50 +50 @@
  * and update this variable as CPUs comes online. (The code is done already.)
  */
-RTCPUSET                    g_rtMpNtCpuSet;
+RTCPUSET                            g_rtMpNtCpuSet;
 
 /** ExSetTimerResolution, introduced in W2K. */
-PFNMYEXSETTIMERRESOLUTION   g_pfnrtNtExSetTimerResolution;
+PFNMYEXSETTIMERRESOLUTION           g_pfnrtNtExSetTimerResolution;
 /** KeFlushQueuedDpcs, introduced in XP. */
-PFNMYKEFLUSHQUEUEDDPCS      g_pfnrtNtKeFlushQueuedDpcs;
+PFNMYKEFLUSHQUEUEDDPCS              g_pfnrtNtKeFlushQueuedDpcs;
 /** HalRequestIpi, introduced in ??. */
-PFNHALREQUESTIPI            g_pfnrtNtHalRequestIpi;
+PFNHALREQUESTIPI                    g_pfnrtNtHalRequestIpi;
 /** HalSendSoftwareInterrupt */
-PFNHALSENDSOFTWAREINTERRUPT g_pfnrtNtHalSendSoftwareInterrupt;
+PFNHALSENDSOFTWAREINTERRUPT         g_pfnrtNtHalSendSoftwareInterrupt;
 /** SendIpi handler based on Windows version */
-PFNRTSENDIPI                g_pfnrtSendIpi;
+PFNRTSENDIPI                        g_pfnrtSendIpi;
 /** KeIpiGenericCall - Windows Server 2003+ only */
-PFNRTKEIPIGENERICCALL       g_pfnrtKeIpiGenericCall;
+PFNRTKEIPIGENERICCALL               g_pfnrtKeIpiGenericCall;
 /** RtlGetVersion, introduced in ??. */
-PFNRTRTLGETVERSION          g_pfnrtRtlGetVersion;
+PFNRTRTLGETVERSION                  g_pfnrtRtlGetVersion;
+#ifndef RT_ARCH_AMD64
+/** KeQueryInterruptTime - exported/new in Windows 2000. */
+PFNRTKEQUERYINTERRUPTTIME           g_pfnrtKeQueryInterruptTime;
+/** KeQuerySystemTime - exported/new in Windows 2000. */
+PFNRTKEQUERYSYSTEMTIME              g_pfnrtKeQuerySystemTime;
+#endif
+/** KeQueryInterruptTimePrecise - new in Windows 8. */
+PFNRTKEQUERYINTERRUPTTIMEPRECISE    g_pfnrtKeQueryInterruptTimePrecise;
+/** KeQuerySystemTimePrecise - new in Windows 8. */
+PFNRTKEQUERYSYSTEMTIMEPRECISE       g_pfnrtKeQuerySystemTimePrecise;
 
 /** Offset of the _KPRCB::QuantumEnd field. 0 if not found. */
-uint32_t                    g_offrtNtPbQuantumEnd;
+uint32_t                            g_offrtNtPbQuantumEnd;
 /** Size of the _KPRCB::QuantumEnd field. 0 if not found. */
-uint32_t                    g_cbrtNtPbQuantumEnd;
+uint32_t                            g_cbrtNtPbQuantumEnd;
 /** Offset of the _KPRCB::DpcQueueDepth field. 0 if not found. */
-uint32_t                    g_offrtNtPbDpcQueueDepth;
+uint32_t                            g_offrtNtPbDpcQueueDepth;
 
 
@@ -200 +210 @@
 /** @todo Port to W2K8 with > 64 cpus/threads. */
 
+    /*
+     * Initialize the function pointers.
+     */
 #ifdef IPRT_TARGET_NT4
     g_pfnrtNtExSetTimerResolution = NULL;
@@ -207 +220 @@
     g_pfnrtKeIpiGenericCall = NULL;
     g_pfnrtRtlGetVersion = NULL;
+    g_pfnrtKeQueryInterruptTime = NULL;
+    g_pfnrtKeQueryInterruptTimePrecise = NULL;
+    g_pfnrtKeQuerySystemTime = NULL;
+    g_pfnrtKeQuerySystemTimePrecise = NULL;
 #else
-    /*
-     * Initialize the function pointers.
-     */
     UNICODE_STRING RoutineName;
     RtlInitUnicodeString(&RoutineName, L"ExSetTimerResolution");
@@ -229 +243 @@
     RtlInitUnicodeString(&RoutineName, L"RtlGetVersion");
     g_pfnrtRtlGetVersion = (PFNRTRTLGETVERSION)MmGetSystemRoutineAddress(&RoutineName);
+# ifndef RT_ARCH_AMD64
+    RtlInitUnicodeString(&RoutineName, L"KeQueryInterruptTime");
+    g_pfnrtKeQueryInterruptTime = (PFNRTKEQUERYINTERRUPTTIME)MmGetSystemRoutineAddress(&RoutineName);
+
+    RtlInitUnicodeString(&RoutineName, L"KeQuerySystemTime");
+    g_pfnrtKeQuerySystemTime = (PFNRTKEQUERYSYSTEMTIME)MmGetSystemRoutineAddress(&RoutineName);
+# endif
+    RtlInitUnicodeString(&RoutineName, L"KeQueryInterruptTimePrecise");
+    g_pfnrtKeQueryInterruptTimePrecise = (PFNRTKEQUERYINTERRUPTTIMEPRECISE)MmGetSystemRoutineAddress(&RoutineName);
+
+    RtlInitUnicodeString(&RoutineName, L"KeQuerySystemTimePrecise");
+    g_pfnrtKeQuerySystemTimePrecise = (PFNRTKEQUERYSYSTEMTIMEPRECISE)MmGetSystemRoutineAddress(&RoutineName);
 #endif
 

trunk/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h

@@ -42 +42 @@
 typedef ULONG_PTR (__stdcall *PFNRTKEIPIGENERICCALL)(PKIPI_BROADCAST_WORKER BroadcastFunction, ULONG_PTR  Context);
 typedef ULONG (__stdcall *PFNRTRTLGETVERSION)(PRTL_OSVERSIONINFOEXW pVerInfo);
+#ifndef RT_ARCH_AMD64
+typedef ULONGLONG (__stdcall *PFNRTKEQUERYINTERRUPTTIME)(VOID);
+typedef VOID (__stdcall *PFNRTKEQUERYSYSTEMTIME)(PLARGE_INTEGER pTime);
+#endif
+typedef ULONG64 (__stdcall *PFNRTKEQUERYINTERRUPTTIMEPRECISE)(PULONG64 pQpcTS);
+typedef VOID (__stdcall *PFNRTKEQUERYSYSTEMTIMEPRECISE)(PLARGE_INTEGER pTime);
+
 
 /*******************************************************************************
 *   Global Variables                                                           *
 *******************************************************************************/
-extern RTCPUSET                     g_rtMpNtCpuSet;
-extern PFNMYEXSETTIMERRESOLUTION    g_pfnrtNtExSetTimerResolution;
-extern PFNMYKEFLUSHQUEUEDDPCS       g_pfnrtNtKeFlushQueuedDpcs;
-extern PFNHALREQUESTIPI             g_pfnrtNtHalRequestIpi;
-extern PFNHALSENDSOFTWAREINTERRUPT  g_pfnrtNtHalSendSoftwareInterrupt;
-extern PFNRTSENDIPI                 g_pfnrtSendIpi;
-extern PFNRTKEIPIGENERICCALL        g_pfnrtKeIpiGenericCall;
-extern PFNRTRTLGETVERSION             g_pfnrtRtlGetVersion;
-extern uint32_t                     g_offrtNtPbQuantumEnd;
-extern uint32_t                     g_cbrtNtPbQuantumEnd;
-extern uint32_t                     g_offrtNtPbDpcQueueDepth;
+extern RTCPUSET                         g_rtMpNtCpuSet;
+extern PFNMYEXSETTIMERRESOLUTION        g_pfnrtNtExSetTimerResolution;
+extern PFNMYKEFLUSHQUEUEDDPCS           g_pfnrtNtKeFlushQueuedDpcs;
+extern PFNHALREQUESTIPI                 g_pfnrtNtHalRequestIpi;
+extern PFNHALSENDSOFTWAREINTERRUPT      g_pfnrtNtHalSendSoftwareInterrupt;
+extern PFNRTSENDIPI                     g_pfnrtSendIpi;
+extern PFNRTKEIPIGENERICCALL            g_pfnrtKeIpiGenericCall;
+extern PFNRTRTLGETVERSION               g_pfnrtRtlGetVersion;
+#ifndef RT_ARCH_AMD64
+extern PFNRTKEQUERYINTERRUPTTIME        g_pfnrtKeQueryInterruptTime;
+extern PFNRTKEQUERYSYSTEMTIME           g_pfnrtKeQuerySystemTime;
+#endif
+extern PFNRTKEQUERYINTERRUPTTIMEPRECISE g_pfnrtKeQueryInterruptTimePrecise;
+extern PFNRTKEQUERYSYSTEMTIMEPRECISE    g_pfnrtKeQuerySystemTimePrecise;
+extern uint32_t                         g_offrtNtPbQuantumEnd;
+extern uint32_t                         g_cbrtNtPbQuantumEnd;
+extern uint32_t                         g_offrtNtPbDpcQueueDepth;
 
 

trunk/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp

@@ -31 +31 @@
 #define LOG_GROUP RTLOGGROUP_TIME
 #include "the-nt-kernel.h"
+#include "internal-r0drv-nt.h"
 #include <iprt/time.h>
 
@@ -49 +50 @@
      */
 #if 1
-    /* Interrupt time. (NT4 doesn't have an API for it.) */
-# ifndef IPRT_TARGET_NT4
-    ULONGLONG InterruptTime = KeQueryInterruptTime();
-    return (uint64_t)InterruptTime * 100; /* The value is in 100ns, convert to ns units. */
+    /* Interrupt time. */
+    LARGE_INTEGER InterruptTime;
+    if (g_pfnrtKeQueryInterruptTimePrecise)
+    {
+        ULONG64 QpcTsIgnored;
+        InterruptTime.QuadPart = g_pfnrtKeQueryInterruptTimePrecise(&QpcTsIgnored);
+    }
+# ifdef RT_ARCH_AMD64
+    else
+        InterruptTime.QuadPart = KeQueryInterruptTime(); /* macro */
 # else
-    LARGE_INTEGER InterruptTime;
-    do
+    else if (g_pfnrtKeQueryInterruptTime)
+        InterruptTime.QuadPart = g_pfnrtKeQueryInterruptTime();
+    else
     {
-        InterruptTime.HighPart = ((KUSER_SHARED_DATA volatile *)SharedUserData)->InterruptTime.High1Time;
-        InterruptTime.LowPart = ((KUSER_SHARED_DATA volatile *)SharedUserData)->InterruptTime.LowPart;
-    } while (((KUSER_SHARED_DATA volatile *)SharedUserData)->InterruptTime.High2Time != InterruptTime.HighPart);
-
+        /* NT4 (no API) and pre-init fallback. */
+        do
+        {
+            InterruptTime.HighPart = ((KUSER_SHARED_DATA volatile *)SharedUserData)->InterruptTime.High1Time;
+            InterruptTime.LowPart = ((KUSER_SHARED_DATA volatile *)SharedUserData)->InterruptTime.LowPart;
+        } while (((KUSER_SHARED_DATA volatile *)SharedUserData)->InterruptTime.High2Time != InterruptTime.HighPart);
+    }
+# endif
     return (uint64_t)InterruptTime.QuadPart * 100;
-# endif
 #else
     /* Tick Count (NT4 SP1 has these APIs, haven't got SP0 to check). */
@@ -99 +110 @@
 {
     LARGE_INTEGER SystemTime;
-#ifndef IPRT_TARGET_NT4
-    KeQuerySystemTime(&SystemTime);
+    if (g_pfnrtKeQuerySystemTimePrecise)
+        g_pfnrtKeQuerySystemTimePrecise(&SystemTime);
+#ifdef RT_ARCH_AMD64
+    else
+        KeQuerySystemTime(&SystemTime); /* macro */
 #else
-    do
+    else if (g_pfnrtKeQuerySystemTime)
+        g_pfnrtKeQuerySystemTime(&SystemTime);
+    else
     {
-        SystemTime.HighPart = ((KUSER_SHARED_DATA volatile *)SharedUserData)->SystemTime.High1Time;
-        SystemTime.LowPart = ((KUSER_SHARED_DATA volatile *)SharedUserData)->SystemTime.LowPart;
-    } while (((KUSER_SHARED_DATA volatile *)SharedUserData)->SystemTime.High2Time != SystemTime.HighPart);
+        do
+        {
+            SystemTime.HighPart = ((KUSER_SHARED_DATA volatile *)SharedUserData)->SystemTime.High1Time;
+            SystemTime.LowPart = ((KUSER_SHARED_DATA volatile *)SharedUserData)->SystemTime.LowPart;
+        } while (((KUSER_SHARED_DATA volatile *)SharedUserData)->SystemTime.High2Time != SystemTime.HighPart);
+    }
 #endif
     return RTTimeSpecSetNtTime(pTime, SystemTime.QuadPart);