andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WaitForSomething: only rewind when delta is more than 250ms

Browse Source 
Only rewind time when we're more than (original delta + 250ms) away from
executing the timer.
When we're walking the timer list, use a goto to iterate all of them from
the start again, since timers may drop out of the list.
Don't bother trying to be smart in TimerSet, we'll pick it up in
WaitForSomething anyway.
(cherry picked from 51a06b3c44 commit)
This commit is contained in:
Daniel Stone 2006-10-29 03:40:57 +03:00 committed by Daniel Stone
parent 8d3b465eb3
commit bb7a39ac13
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
os/WaitFor.c
View File

@ -202,11 +202,12 @@ WaitForSomething(int *pClientsReady)
{
now = GetTimeInMillis();
timeout = timers->expires - now;
/* time has rewound. reset the timers. */
if (timeout > timers->delta) {
if (timeout > 0 && timeout > timers->delta + 250) {
/* time has rewound. reset the timers. */
CheckAllTimers(now);
timeout = timers->expires - now;
}
if (timeout < 0)
timeout = 0;
waittime.tv_sec = timeout / MILLI_PER_SECOND;
@ -434,17 +435,18 @@ ANYSET(FdMask *src)
#endif
/* If time has rewound, re-run every affected timer.
* TimerForce will change timer->next, but it will _generally_ only
* promote timers in the list, meaning that we should still be
* walking every timer. */
* Timers might drop out of the list, so we have to restart every time. */
static void
CheckAllTimers(CARD32 now)
{
OsTimerPtr timer;
start:
for (timer = timers; timer; timer = timer->next) {
if (timer->expires - now > timer->delta)
if (timer->expires - now > timer->delta + 250) {
TimerForce(timer);
goto start;
}
}
}
@ -507,10 +509,8 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
}
for (prev = &timers;
*prev && (int) ((*prev)->expires - millis) <= 0;
prev = &(*prev)->next) {
if ((*prev)->expires - now > (*prev)->delta)
CheckAllTimers(now);
}
prev = &(*prev)->next)
;
timer->next = *prev;
*prev = timer;
return timer;