Changeset 46223 in vbox

Timestamp:

May 22, 2013 5:18:47 PM (12 years ago)

Author:

vboxsync

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

85951

Message:

Must use same time source in user and kernel land otherwise we might get huge deltas between GIP time and system time.

Location:

trunk/src/VBox/Runtime

Files:

• r0drv/nt/time-r0drv-nt.cpp (modified) (2 diffs)
• r3/win/time-win.cpp (modified) (2 diffs)

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

@@ -36 +36 @@
 DECLINLINE(uint64_t) rtTimeGetSystemNanoTS(void)
 {
-#ifndef IPRT_TARGET_NT4
+    /*
+     * Note! The time source we use here must be exactly the same as in
+     *       the ring-3 code!
+     */
+#if 0
+# ifndef IPRT_TARGET_NT4
     ULONGLONG InterruptTime = KeQueryInterruptTime();
     return (uint64_t)InterruptTime * 100; /* The value is in 100ns, convert to ns units. */
-#else
+# else
     LARGE_INTEGER InterruptTime;
     do
@@ -48 +53 @@
 
     return (uint64_t)InterruptTime.QuadPart * 100;
+# endif
+#else
+    LARGE_INTEGER Tick;
+    KeQueryTickCount(&Tick);
+    return (uint64_t)Tick.QuadPart * KeQueryTimeIncrement() * 100;
 #endif
 }

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

@@ -40 +40 @@
 #include "internal/time.h"
 
+/*
+ * Note! The selected time source be the exact same one as we use in kernel land!
+ */
 #define USE_TICK_COUNT
 //#define USE_PERFORMANCE_COUNTER
-#if 0//defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
-# define USE_INTERRUPT_TIME
-#else
 //# define USE_FILE_TIME
-#endif
+//#if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
+//# define USE_INTERRUPT_TIME
+//#else
+//# define USE_TICK_COUNT
+//#endif
 
 
@@ -115 +119 @@
          * detection algorithm if necessary. The com debugger class
          * exports this too, windbg knows it too... */
-        s_pUserSharedData = (MY_ KUSER_SHARED_DATA *)(uintptr_t)0x7ffe0000;
+        s_pUserSharedData = (PMY_KUSER_SHARED_DATA)(uintptr_t)0x7ffe0000;
     }