Changeset 47637 in vbox for trunk

Timestamp:

Aug 9, 2013 1:12:19 PM (11 years ago)

Author:

vboxsync

Message:

Runtime/r0drv/nt: fix Windows r0drv timers

File:

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

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

@@ -122 +122 @@
     if (    !ASMAtomicUoReadBool(&pTimer->fSuspended)
         &&  pTimer->u32Magic == RTTIMER_MAGIC)
+    {
+        if (!pTimer->u64NanoInterval)
+            ASMAtomicWriteBool(&pTimer->fSuspended, true);
         pTimer->pfnTimer(pTimer, pTimer->pvUser, ++pTimer->aSubTimers[0].iTick);
+    }
 
     NOREF(pDpc); NOREF(SystemArgument1); NOREF(SystemArgument2);
@@ -155 +159 @@
     if (    !ASMAtomicUoReadBool(&pTimer->fSuspended)
         &&  pTimer->u32Magic == RTTIMER_MAGIC)
+    {
+        if (!pTimer->u64NanoInterval)
+            ASMAtomicWriteBool(&pTimer->fSuspended, true);
         pTimer->pfnTimer(pTimer, pTimer->pvUser, ++pSubTimer->iTick);
+    }
 
     NOREF(pDpc); NOREF(SystemArgument1); NOREF(SystemArgument2);
@@ -200 +208 @@
                 KeInsertQueueDpc(&pTimer->aSubTimers[iCpu].NtDpc, 0, 0);
 
+        if (!pTimer->u64NanoInterval)
+            ASMAtomicWriteBool(&pTimer->fSuspended, true);
         pTimer->pfnTimer(pTimer, pTimer->pvUser, ++pSubTimer->iTick);
     }
@@ -238 +248 @@
     LARGE_INTEGER DueTime;
     DueTime.QuadPart = -(int64_t)(u64First / 100); /* Relative, NT time. */
-    if (DueTime.QuadPart)
+    if (!DueTime.QuadPart)
         DueTime.QuadPart = -1;
 
+    unsigned cSubTimers = pTimer->fOmniTimer ? pTimer->cSubTimers : 1;
+    for (unsigned iCpu = 0; iCpu < cSubTimers; iCpu++)
+        pTimer->aSubTimers[iCpu].iTick = 0;
     ASMAtomicWriteBool(&pTimer->fSuspended, false);
     KeSetTimerEx(&pTimer->NtTimer, DueTime, ulInterval, pMasterDpc);