diff options
Diffstat (limited to 'src/vm/win32threadpool.cpp')
| -rw-r--r-- | src/vm/win32threadpool.cpp | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/src/vm/win32threadpool.cpp b/src/vm/win32threadpool.cpp index bc84762b06..a79656e745 100644 --- a/src/vm/win32threadpool.cpp +++ b/src/vm/win32threadpool.cpp @@ -4755,15 +4755,30 @@ DWORD ThreadpoolMgr::FireTimers() timerInfo, QUEUE_ONLY /* TimerInfo take care of deleting*/); - timerInfo->FiringTime = currentTime+timerInfo->Period; + if (timerInfo->Period != 0 && timerInfo->Period != (ULONG)-1) + { + ULONG nextFiringTime = timerInfo->FiringTime + timerInfo->Period; + DWORD firingInterval; + if (TimeExpired(timerInfo->FiringTime, currentTime, nextFiringTime)) + { + // Enough time has elapsed to fire the timer yet again. The timer is not able to keep up with the short + // period, have it fire 1 ms from now to avoid spinning without a delay. + timerInfo->FiringTime = currentTime + 1; + firingInterval = 1; + } + else + { + timerInfo->FiringTime = nextFiringTime; + firingInterval = TimeInterval(nextFiringTime, currentTime); + } - if ((timerInfo->Period != 0) && (timerInfo->Period != (ULONG) -1) && (nextFiringInterval > timerInfo->Period)) - nextFiringInterval = timerInfo->Period; + if (firingInterval < nextFiringInterval) + nextFiringInterval = firingInterval; + } } - else { - DWORD firingInterval = TimeInterval(timerInfo->FiringTime,currentTime); + DWORD firingInterval = TimeInterval(timerInfo->FiringTime, currentTime); if (firingInterval < nextFiringInterval) nextFiringInterval = firingInterval; } |