mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-22 13:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] implemented better clock drift correction

Browse source
This commit is contained in:
Geoffrey McRae 2020-05-22 20:45:59 +10:00
parent f5da432d38
commit 4441427943
3 changed files with 50 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
B2-rc1-6-g60f665a65c+1
B2-rc1-7-gf5da432d38+1

42
client/src/main.c
View file

@ -154,28 +154,23 @@ static int renderThread(void * unused)
while(state.running)
{
// if our clock is too far out of sync, resync it
// this can happen when switching to/from a TTY, or due to clock drift
// we only check this once every 100 frames
if (state.frameTime > 0 && ++resyncCheck == 100)
if (state.frameTime > 0)
{
resyncCheck = 0;
tsAdd(&time, state.frameTime);
struct timespec tmp;
clock_gettime(CLOCK_REALTIME, &tmp);
if (tmp.tv_nsec - time.tv_nsec < 0)
// if our clock is too far out of sync, resync it
// this can happen when switching to/from a TTY, or due to clock drift
// we only check this once every 100 frames
if (++resyncCheck == 100)
{
tmp.tv_sec -= time.tv_sec - 1;
tmp.tv_nsec = 1000000000 + tmp.tv_nsec - time.tv_nsec;
}
else
{
tmp.tv_sec -= time.tv_sec;
tmp.tv_nsec -= time.tv_nsec;
}
resyncCheck = 0;
if (tmp.tv_sec > 1)
clock_gettime(CLOCK_REALTIME, &time);
struct timespec end, diff;
clock_gettime(CLOCK_REALTIME, &end);
tsDiff(&diff, &time, &end);
if (diff.tv_sec > 0 || diff.tv_nsec > 1000000000) // 100ms
clock_gettime(CLOCK_REALTIME, &time);
}
}
if (state.lgrResize)
@ -218,18 +213,7 @@ static int renderThread(void * unused)
}
if (state.frameTime > 0)
{
uint64_t nsec = time.tv_nsec + state.frameTime;
if(nsec > 1e9)
{
time.tv_nsec = nsec - 1e9;
++time.tv_sec;
}
else
time.tv_nsec = nsec;
lgWaitEventAbs(e_frame, &time);
}
}
state.running = false;

36
common/include/common/time.h
View file

@ -66,6 +66,42 @@ static inline void nsleep(uint64_t ns)
};
nanosleep(&ts, NULL);
}
static inline void tsDiff(struct timespec *diff, const struct timespec *left,
const struct timespec *right)
{
diff->tv_sec = left->tv_sec - right->tv_sec;
diff->tv_nsec = left->tv_nsec - right->tv_nsec;
if (diff->tv_nsec < 0)
{
--diff->tv_sec;
diff->tv_nsec += 1000000000;
}
}
static inline uint32_t __iter_div_u64_rem(uint64_t dividend, uint32_t divisor, uint64_t *remainder)
{
uint32_t ret = 0;
while (dividend >= divisor) {
/* The following asm() prevents the compiler from
optimising this loop into a modulo operation. */
asm("" : "+rm"(dividend));
dividend -= divisor;
ret++;
}
*remainder = dividend;
return ret;
}
static inline void tsAdd(struct timespec *a, uint64_t ns)
{
a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, 1000000000L, &ns);
a->tv_nsec = ns;
}
#endif
typedef bool (*LGTimerFn)(void * udata);