BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use monotonic clock for time 

Remove handling of the so-called "time disorders".

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2019-02-21 03:36:51 +00:00
parent 934c269f9b
commit 6909597ee3
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common.h
View File

@ -98,12 +98,9 @@
#define REGISTER_PROP "_NET_WM_CM_S" #define REGISTER_PROP "_NET_WM_CM_S"
#define TIME_MS_MAX LONG_MAX #define TIME_MS_MAX LONG_MAX
#define FADE_DELTA_TOLERANCE 0.2
#define SWOPTI_TOLERANCE 3000 #define SWOPTI_TOLERANCE 3000
#define WIN_GET_LEADER_MAX_RECURSION 20 #define WIN_GET_LEADER_MAX_RECURSION 20
#define SEC_WRAP (15L * 24L * 60L * 60L)
#define NS_PER_SEC 1000000000L #define NS_PER_SEC 1000000000L
#define US_PER_SEC 1000000L #define US_PER_SEC 1000000L
#define MS_PER_SEC 1000 #define MS_PER_SEC 1000

19
src/compton.c
View File

@ -160,13 +160,11 @@ free_xinerama_info(session_t *ps) {
/** /**
* Get current system clock in milliseconds. * Get current system clock in milliseconds.
*/ */
static inline unsigned long static inline uint64_t
get_time_ms(void) { get_time_ms(void) {
struct timeval tv; struct timespec tp;
clock_gettime(CLOCK_MONOTONIC, &tp);
gettimeofday(&tv, NULL); return tp.tv_sec * ((uint64_t)1000ul) + tp.tv_nsec / 1000000;
return tv.tv_sec % SEC_WRAP * 1000 + tv.tv_usec / 1000;
} }
// XXX Move to x.c // XXX Move to x.c
@ -477,11 +475,11 @@ paint_preprocess(session_t *ps, bool *fade_running) {
// Fading step calculation // Fading step calculation
unsigned long steps = 0L; unsigned long steps = 0L;
auto now = get_time_ms(); auto now = get_time_ms();
auto tolerance = FADE_DELTA_TOLERANCE*ps->o.fade_delta; if (ps->fade_time) {
if (ps->fade_time && now+tolerance >= ps->fade_time) { assert(now >= ps->fade_time);
steps = (now - ps->fade_time + tolerance) / ps->o.fade_delta; steps = (now - ps->fade_time) / ps->o.fade_delta;
} else { } else {
// Reset fade_time if unset, or there appears to be a time disorder // Reset fade_time if unset
ps->fade_time = get_time_ms(); ps->fade_time = get_time_ms();
steps = 0L; steps = 0L;
} }
@ -1890,6 +1888,7 @@ swopti_handle_timeout(session_t *ps) {
// Get the microsecond offset of the time when the we reach the timeout // Get the microsecond offset of the time when the we reach the timeout
// I don't think a 32-bit long could overflow here. // I don't think a 32-bit long could overflow here.
long offset = (get_time_timeval().tv_usec - ps->paint_tm_offset) % ps->refresh_intv; long offset = (get_time_timeval().tv_usec - ps->paint_tm_offset) % ps->refresh_intv;
// XXX this formula dones't work if refresh rate is not a whole number
if (offset < 0) if (offset < 0)
offset += ps->refresh_intv; offset += ps->refresh_intv;