Changeset 9583 in vbox for trunk/src

Timestamp:

Jun 10, 2008 11:45:10 PM (17 years ago)

Author:

vboxsync

Message:

Some fixes and adjustments.

File:

• trunk/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp (modified) (12 diffs)

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

@@ -146 +146 @@
     if (KeGetCurrentIrql() < DISPATCH_LEVEL)
         AssertMsg2("rtTimerNtOmniSlaveCallback: Irql=%d expected >=%d\n", KeGetCurrentIrql(), DISPATCH_LEVEL);
-    RTCPUID iCpuSelf = RTMpCpuIdToSetIndex(RTMpCpuId());
+    int iCpuSelf = RTMpCpuIdToSetIndex(RTMpCpuId());
     if (pSubTimer - &pTimer->aSubTimers[0] != iCpuSelf)
         AssertMsg2("rtTimerNtOmniSlaveCallback: iCpuSelf=%d pSubTimer=%p / %d\n", iCpuSelf, pSubTimer, pSubTimer - &pTimer->aSubTimers[0]);
@@ -177 +177 @@
     PRTTIMERNTSUBTIMER pSubTimer = (PRTTIMERNTSUBTIMER)pvUser;
     PRTTIMER pTimer = pSubTimer->pParent;
-    RTCPUID iCpuSelf = RTMpCpuIdToSetIndex(RTMpCpuId());
+    int iCpuSelf = RTMpCpuIdToSetIndex(RTMpCpuId());
 
     AssertPtr(pTimer);
@@ -196 +196 @@
         RTCPUSET    OnlineSet;
         RTMpGetOnlineSet(&OnlineSet);
-        for (RTCPUID iCpu = 0; iCpu < RTCPUSET_MAX_CPUS; iCpu++)
+        for (int iCpu = 0; iCpu < RTCPUSET_MAX_CPUS; iCpu++)
             if (    RTCpuSetIsMemberByIndex(&OnlineSet, iCpu)
                 &&  iCpuSelf != iCpu)
@@ -235 +235 @@
 
     LARGE_INTEGER DueTime;
-    DueTime.QuadPart = -(int64_t)(u64First / 10000); /* Relative, NT time. */
+    DueTime.QuadPart = -(int64_t)(u64First / 100); /* Relative, NT time. */
     if (DueTime.QuadPart)
         DueTime.QuadPart = -1;
@@ -245 +245 @@
 
 
+/**
+ * Worker function that stops an active timer.
+ *
+ * Shared by RTTimerStop and RTTimerDestroy.
+ *
+ * @param   pTimer      The active timer.
+ */
+static void rtTimerNtStopWorker(PRTTIMER pTimer)
+{
+    /*
+     * Just cancel the timer, dequeue the DPCs and flush them (if this is supported).
+     */
+    ASMAtomicWriteBool(&pTimer->fSuspended, true);
+    KeCancelTimer(&pTimer->NtTimer);
+
+    for (RTCPUID iCpu = 0; iCpu < pTimer->cSubTimers; iCpu++)
+        KeRemoveQueueDpc(&pTimer->aSubTimers[iCpu].NtDpc);
+
+    /*
+     * I'm a bit uncertain whether this should be done during RTTimerStop
+     * or only in RTTimerDestroy()... Linux and Solaris will wait AFAIK,
+     * which is why I'm keeping this here for now.
+     */
+    if (g_pfnrtNtKeFlushQueuedDpcs)
+        g_pfnrtNtKeFlushQueuedDpcs();
+}
+
+
 RTDECL(int) RTTimerStop(PRTTIMER pTimer)
 {
-
     /*
      * Validate.
@@ -258 +285 @@
 
     /*
-     * Just cancel the timer and flush DPCs.
-     */
-    ASMAtomicWriteBool(&pTimer->fSuspended, true);
-    KeCancelTimer(&pTimer->NtTimer);
-    if (g_pfnrtNtKeFlushQueuedDpcs)
-        g_pfnrtNtKeFlushQueuedDpcs();
-
+     * Call the worker we share with RTTimerDestroy.
+     */
+    rtTimerNtStopWorker(pTimer);
     return VINF_SUCCESS;
 }
@@ -278 +301 @@
 
     /*
-     * Stop the timer if it's running.
-     */
+     * Invalidate the timer, stop it if it's running and finally                   .
+     * free up the memory.
+     */
+    ASMAtomicWriteU32(&pTimer->u32Magic, ~RTTIMER_MAGIC);
     if (!ASMAtomicUoReadBool(&pTimer->fSuspended))
-        RTTimerStop(pTimer);
-
-    /*
-     * Uninitialize the structure and free the associated resources.
-     */
-    ASMAtomicWriteU32(&pTimer->u32Magic, ~RTTIMER_MAGIC);
+        rtTimerNtStopWorker(pTimer);
     RTMemFree(pTimer);
 
@@ -344 +364 @@
          */
         pTimer->idCpu = NIL_RTCPUID; /* */
-        for (RTCPUID iCpu = 0; iCpu < cSubTimers; iCpu++)
+        for (unsigned iCpu = 0; iCpu < cSubTimers; iCpu++)
         {
             pTimer->aSubTimers[iCpu].iTick = 0;
@@ -358 +378 @@
                 KeInitializeDpc(&pTimer->aSubTimers[iCpu].NtDpc, rtTimerNtOmniSlaveCallback, &pTimer->aSubTimers[iCpu]);
             KeSetImportanceDpc(&pTimer->aSubTimers[iCpu].NtDpc, HighImportance);
-            KeSetTargetProcessorDpc(&pTimer->aSubTimers[iCpu].NtDpc, RTMpCpuIdFromSetIndex(iCpu));
+            KeSetTargetProcessorDpc(&pTimer->aSubTimers[iCpu].NtDpc, (int)RTMpCpuIdFromSetIndex(iCpu));
         }
         Assert(pTimer->idCpu != NIL_RTCPUID);
@@ -374 +394 @@
         KeSetImportanceDpc(&pTimer->aSubTimers[0].NtDpc, HighImportance);
         if (pTimer->fSpecificCpu)
-            KeSetTargetProcessorDpc(&pTimer->aSubTimers[0].NtDpc, pTimer->idCpu);
+            KeSetTargetProcessorDpc(&pTimer->aSubTimers[0].NtDpc, (int)pTimer->idCpu);
     }
 
@@ -384 +404 @@
 RTDECL(uint32_t) RTTimerGetSystemGranularity(void)
 {
+    /*
+     * Get the default/max timer increment value, return it if ExtSetTimerResolution
+     * isn't available. Accoring to the sysinternals guys NtQueryTimerResolution
+     * is only available in userland and they find it equally annoying.
+     */
+    ULONG ulTimeInc = KeQueryTimeIncrement();
     if (!g_pfnrtNtExSetTimerResolution)
-        return 156250; /* AMD64 default, will hopefully work for x86 too... */
-
-    /*
-     * First try set it to the AMD64 default (which is higher than the default than x86)
-     * and then restore it immediately. Wonder if this really works...
-     */
-    ULONG ulResolution1 = g_pfnrtNtExSetTimerResolution(156250, TRUE);
+        return ulTimeInc * 100; /* The value is in 100ns, the funny NT unit. */
+
+    /*
+     * Use the value returned by ExSetTimerResolution. Since the kernel is keeping
+     * count of these calls, we have to do two calls that cancel each other out.
+     */
+    ULONG ulResolution1 = g_pfnrtNtExSetTimerResolution(ulTimeInc, TRUE);
     ULONG ulResolution2 = g_pfnrtNtExSetTimerResolution(0 /*ignored*/, FALSE);
-    AssertMsg(ulResolution1 == ulResolution2, ("%ld, %ld\n", ulResolution1, ulResolution2));
-    return ulResolution2 * 10000; /* NT -> ns */
+    AssertMsg(ulResolution1 == ulResolution2, ("%ld, %ld\n", ulResolution1, ulResolution2)); /* not supposed to change it! */
+    return ulResolution2 * 100; /* NT -> ns */
 }
 
@@ -403 +429 @@
         return VERR_NOT_SUPPORTED;
 
-    ULONG ulGranted = g_pfnrtNtExSetTimerResolution(u32Request / 10000, TRUE);
+    ULONG ulGranted = g_pfnrtNtExSetTimerResolution(u32Request / 100, TRUE);
     if (pu32Granted)
         *pu32Granted = ulGranted;