procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve X server time computation

Browse source 
* src/xterm.c (x_sync_get_monotonic_time): Use that if
available.
(x_display_set_last_user_time): Compute an offset between the
monotonic time and the X server time if they are not identical.
* src/xterm.h (struct x_display_info): New field
`server_time_offset'.
This commit is contained in:
Po Lu 2022-08-03 15:13:14 +08:00
parent 99bbc1fa23
commit bb3e281236
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/xterm.c
View file

@ -6645,7 +6645,11 @@ x_sync_get_monotonic_time (struct x_display_info *dpyinfo,
if (dpyinfo->server_time_monotonic_p)
return timestamp;
return 0;
/* This means we haven't yet initialized the server time offset. */
if (!dpyinfo->server_time_offset)
return 0;
return timestamp - dpyinfo->server_time_offset;
}
/* Return the current monotonic time in the same format as a
@ -7464,7 +7468,14 @@ x_display_set_last_user_time (struct x_display_info *dpyinfo, Time time,
&& time * 1000 < monotonic_time + 500 * 1000)
dpyinfo->server_time_monotonic_p = true;
else
dpyinfo->server_time_monotonic_p = false;
{
/* Compute an offset that can be subtracted from the server
time to estimate the monotonic time on the X server. */
dpyinfo->server_time_monotonic_p = false;
dpyinfo->server_time_offset
= ((int64_t) time * 1000) - monotonic_time;
}
}
#endif

4
src/xterm.h
View file

@ -774,6 +774,10 @@ struct x_display_info
/* Whether or not the server time is probably the same as
"clock_gettime (CLOCK_MONOTONIC, ...)". */
bool server_time_monotonic_p;
/* The time difference between the X server clock and the monotonic
clock. */
int64_t server_time_offset;
#endif
};