marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Use monotonic clock for SetTimer timeouts. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Piotr Caban 2020-04-06 17:21:07 +02:00 committed by Alexandre Julliard
parent f016a96345
commit af89b53cef
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/file.h
View File

@ -140,6 +140,12 @@ static inline abstime_t timeout_to_abstime( timeout_t timeout )
return timeout > 0 ? timeout : timeout - monotonic_time; return timeout > 0 ? timeout : timeout - monotonic_time;
} }
static inline timeout_t abstime_to_timeout( abstime_t abstime )
{
if (abstime > 0) return abstime;
return -abstime < monotonic_time ? 0 : abstime + monotonic_time;
}
extern void set_current_time( void ); extern void set_current_time( void );
extern struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private ); extern struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private );
extern void remove_timeout_user( struct timeout_user *user ); extern void remove_timeout_user( struct timeout_user *user );

10
server/queue.c
View File

@ -89,7 +89,7 @@ struct message
struct timer struct timer
{ {
struct list entry; /* entry in timer list */ struct list entry; /* entry in timer list */
timeout_t when; /* next expiration */ abstime_t when; /* next expiration */
unsigned int rate; /* timer rate in ms */ unsigned int rate; /* timer rate in ms */
user_handle_t win; /* window handle */ user_handle_t win; /* window handle */
unsigned int msg; /* message to post */ unsigned int msg; /* message to post */
@ -1154,7 +1154,7 @@ static void set_next_timer( struct msg_queue *queue )
if ((ptr = list_head( &queue->pending_timers ))) if ((ptr = list_head( &queue->pending_timers )))
{ {
struct timer *timer = LIST_ENTRY( ptr, struct timer, entry ); struct timer *timer = LIST_ENTRY( ptr, struct timer, entry );
queue->timeout = add_timeout_user( timer->when, timer_callback, queue ); queue->timeout = add_timeout_user( abstime_to_timeout(timer->when), timer_callback, queue );
} }
/* set/clear QS_TIMER bit */ /* set/clear QS_TIMER bit */
if (list_empty( &queue->expired_timers )) if (list_empty( &queue->expired_timers ))
@ -1206,7 +1206,7 @@ static void link_timer( struct msg_queue *queue, struct timer *timer )
for (ptr = queue->pending_timers.next; ptr != &queue->pending_timers; ptr = ptr->next) for (ptr = queue->pending_timers.next; ptr != &queue->pending_timers; ptr = ptr->next)
{ {
struct timer *t = LIST_ENTRY( ptr, struct timer, entry ); struct timer *t = LIST_ENTRY( ptr, struct timer, entry );
if (t->when >= timer->when) break; if (t->when <= timer->when) break;
} }
list_add_before( ptr, &timer->entry ); list_add_before( ptr, &timer->entry );
} }
@ -1223,7 +1223,7 @@ static void free_timer( struct msg_queue *queue, struct timer *timer )
static void restart_timer( struct msg_queue *queue, struct timer *timer ) static void restart_timer( struct msg_queue *queue, struct timer *timer )
{ {
list_remove( &timer->entry ); list_remove( &timer->entry );
while (timer->when <= current_time) timer->when += (timeout_t)timer->rate * 10000; while (-timer->when <= monotonic_time) timer->when -= (timeout_t)timer->rate * 10000;
link_timer( queue, timer ); link_timer( queue, timer );
set_next_timer( queue ); set_next_timer( queue );
} }
@ -1255,7 +1255,7 @@ static struct timer *set_timer( struct msg_queue *queue, unsigned int rate )
if (timer) if (timer)
{ {
timer->rate = max( rate, 1 ); timer->rate = max( rate, 1 );
timer->when = current_time + (timeout_t)timer->rate * 10000; timer->when = -monotonic_time - (timeout_t)timer->rate * 10000;
link_timer( queue, timer ); link_timer( queue, timer );
/* check if we replaced the next timer */ /* check if we replaced the next timer */
if (list_head( &queue->pending_timers ) == &timer->entry) set_next_timer( queue ); if (list_head( &queue->pending_timers ) == &timer->entry) set_next_timer( queue );