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

Timestamp:

Aug 6, 2013 10:02:19 AM (11 years ago)

Author:

vboxsync

Message:

Runtime/timer-generic: Suspend a one shot timer before calling the timer callback or it is impossible to restart the timer from there (RTTimerStart will return VERR_TIMER_ACTIVE)

File:

• trunk/src/VBox/Runtime/generic/timer-generic.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/generic/timer-generic.cpp

@@ -257 +257 @@
             {
                 pTimer->iTick++;
+
+                /* one shot? */
+                if (!pTimer->u64NanoInterval)
+                    ASMAtomicXchgU8(&pTimer->fSuspended, true);
                 pTimer->pfnTimer(pTimer, pTimer->pvUser, pTimer->iTick);
 
@@ -262 +266 @@
                 if (pTimer->fSuspended || pTimer->fDestroyed)
                     continue;
-
-                /* one shot? */
-                if (!pTimer->u64NanoInterval)
-                {
-                    ASMAtomicXchgU8(&pTimer->fSuspended, true);
-                    continue;
-                }
 
                 /* calc the next time we should fire. */