Changeset 9950 in vbox

Timestamp:

Jun 26, 2008 11:56:57 AM (16 years ago)

Author:

vboxsync

Message:

Corrected NtQueryTimerResolution (max resolution == the lower number), print the results in ns instead of 100ns units.

Location:

trunk/src/VBox/Runtime

Files:

• r3/win/timer-win.cpp (modified) (3 diffs)
• testcase/ntGetTimerResolution.cpp (modified) (2 diffs)

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

@@ -78 +78 @@
 /* from sysinternals. */
 NTSYSAPI LONG NTAPI NtSetTimerResolution(IN ULONG DesiredResolution, IN BOOLEAN SetResolution, OUT PULONG CurrentResolution);
-NTSYSAPI LONG NTAPI NtQueryTimerResolution(OUT PULONG MinimumResolution, OUT PULONG MaximumResolution, OUT PULONG CurrentResolution);
+NTSYSAPI LONG NTAPI NtQueryTimerResolution(OUT PULONG MaximumResolution, OUT PULONG MinimumResolution, OUT PULONG CurrentResolution);
 __END_DECLS
 
@@ -290 +290 @@
      * we start the timer.
      */
-    ULONG Min = ~0;
-    ULONG Max = ~0;
-    ULONG Cur = ~0;
-    NtQueryTimerResolution(&Min, &Max, &Cur);
-    Log(("NtQueryTimerResolution -> Min=%lu Max=%lu Cur=%lu (100ns)\n", Min, Max, Cur));
-    if (Cur > Max && Cur > 10000 /* = 1ms */)
-    {
-        if (NtSetTimerResolution(10000, TRUE, &Cur) >= 0)
+    ULONG ulMax = ~0;
+    ULONG ulMin = ~0;
+    ULONG ulCur = ~0;
+    NtQueryTimerResolution(&ulMax, &ulMin, &ulCur);
+    Log(("NtQueryTimerResolution -> ulMax=%lu00ns ulMin=%lu00ns ulCur=%lu00ns\n", ulMax, ulMin, ulCur));
+    if (ulCur > ulMin && ulCur > 10000 /* = 1ms */)
+    {
+        if (NtSetTimerResolution(10000, TRUE, &ulCur) >= 0)
             Log(("Changed timer resolution to 1ms.\n"));
-        else if (NtSetTimerResolution(20000, TRUE, &Cur) >= 0)
+        else if (NtSetTimerResolution(20000, TRUE, &ulCur) >= 0)
             Log(("Changed timer resolution to 2ms.\n"));
-        else if (NtSetTimerResolution(40000, TRUE, &Cur) >= 0)
+        else if (NtSetTimerResolution(40000, TRUE, &ulCur) >= 0)
             Log(("Changed timer resolution to 4ms.\n"));
-        else if (Max <= 50000 && NtSetTimerResolution(Max, TRUE, &Cur) >= 0)
-            Log(("Changed timer resolution to %lu *100ns.\n", Max));
+        else if (ulMin <= 50000 && NtSetTimerResolution(ulMin, TRUE, &ulCur) >= 0)
+            Log(("Changed timer resolution to %lu *100ns.\n", ulMin));
         else
         {
@@ -330 +330 @@
         if (pTimer->TimerId)
         {
-            ULONG Min = ~0;
-            ULONG Max = ~0;
-            ULONG Cur = ~0;
-            NtQueryTimerResolution(&Min, &Max, &Cur);
-            Log(("NtQueryTimerResolution -> Min=%lu Max=%lu Cur=%lu (100ns)\n", Min, Max, Cur));
+            ULONG ulMax = ~0;
+            ULONG ulMin = ~0;
+            ULONG ulCur = ~0;
+            NtQueryTimerResolution(&ulMax, &ulMin, &ulCur);
+            Log(("NtQueryTimerResolution -> ulMax=%lu00ns ulMin=%lu00ns ulCur=%lu00ns\n", ulMax, ulMin, ulCur));
 
             *ppTimer = pTimer;

trunk/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp

@@ -39 +39 @@
 extern "C" {
 /* from sysinternals. */
-NTSYSAPI LONG NTAPI NtQueryTimerResolution(OUT PULONG MinimumResolution, OUT PULONG MaximumResolution, OUT PULONG CurrentResolution);
+NTSYSAPI LONG NTAPI NtQueryTimerResolution(OUT PULONG MaximumResolution, OUT PULONG MinimumResolution, OUT PULONG CurrentResolution);
 }
 
@@ -48 +48 @@
     ULONG Max = ~0;
     ULONG Cur = ~0;
-    NtQueryTimerResolution(&Min, &Max, &Cur);
-    printf("NtQueryTimerResolution -> Min=%lu Max=%lu Cur=%lu (100ns)\n", Min, Max, Cur);
+    NtQueryTimerResolution(&Max, &Min, &Cur);
+    printf("NtQueryTimerResolution -> Max=%lu00ns Min=%lu00ns Cur=%lu00ns\n", Min, Max, Cur);
 
 #if 0