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

Timestamp:

May 23, 2013 11:23:15 AM (12 years ago)

Author:

vboxsync

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

85960

Message:

GetTickCount isn't usable, bit the bullet and read interrupt time from KUSER_SHARED_DATA in ring-3.

Location:

trunk/src/VBox/Runtime

Files:

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

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

@@ -39 +39 @@
      * Note! The time source we use here must be exactly the same as in
      *       the ring-3 code!
+     *
+     * Using interrupt time is the simplest and requires the least calculation.
+     * It is also accounting for suspended time. Unfortuantely, there is no
+     * ring-3 for reading it... but that won't stop us.
+     *
+     * Using the tick count is problematic in ring-3 on older windows version
+     * as we can only get the 32-bit tick value, i.e. we'll roll over sooner or
+     * later.
      */
-#if 0
+#if 1
+    /* Interrupt time. (NT4 doesn't have an API for it.) */
 # ifndef IPRT_TARGET_NT4
     ULONGLONG InterruptTime = KeQueryInterruptTime();
@@ -55 +64 @@
 # endif
 #else
+    /* Tick Count (NT4 SP1 has these APIs, haven't got SP0 to check). */
     LARGE_INTEGER Tick;
     KeQueryTickCount(&Tick);

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

@@ -43 +43 @@
  * Note! The selected time source be the exact same one as we use in kernel land!
  */
-#define USE_TICK_COUNT
+//#define USE_TICK_COUNT
 //#define USE_PERFORMANCE_COUNTER
 //# define USE_FILE_TIME
 //#if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
-//# define USE_INTERRUPT_TIME
+# define USE_INTERRUPT_TIME
 //#else
 //# define USE_TICK_COUNT
@@ -109 +109 @@
 
 #elif defined USE_INTERRUPT_TIME
+# if 0 /* ASSUME 0x7ffe0000 is set in stone */
     /*
      * This is exactly what we want, but we have to obtain it by non-official
@@ -121 +122 @@
         s_pUserSharedData = (PMY_KUSER_SHARED_DATA)(uintptr_t)0x7ffe0000;
     }
+# endif
+    PMY_KUSER_SHARED_DATA pUserSharedData = (PMY_KUSER_SHARED_DATA)(uintptr_t)0x7ffe0000;
 
     /* use interrupt time */
@@ -126 +129 @@
     do
     {
-        Time.HighPart = s_pUserSharedData->InterruptTime.High1Time;
-        Time.LowPart  = s_pUserSharedData->InterruptTime.LowPart;
-    } while (s_pUserSharedData->InterruptTime.High2Time != Time.HighPart);
+        Time.HighPart = pUserSharedData->InterruptTime.High1Time;
+        Time.LowPart  = pUserSharedData->InterruptTime.LowPart;
+    } while (pUserSharedData->InterruptTime.High2Time != Time.HighPart);
 
     return (uint64_t)Time.QuadPart * 100;