izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1124 from piru/master

Browse Source 
Use CLOCK_MONOTONIC_RAW when available
This commit is contained in:
Andrew Chin
2021-12-08 18:42:38 -05:00
committed by GitHub
parent 6b2ffa904d 87fd565268
commit 311764712e
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/timestamp.cc
+11 -1
View File
@@ -48,6 +48,16 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
// On Apple systems CLOCK_MONOTONIC is unfortunately able to go
// backwards in time. This breaks mosh when system is returning from
// suspend as described in ticket #1014. To avoid this issue prefer
// CLOCK_MONOTONIC_RAW on Apple systems when available.
#if defined(__APPLE__) && defined(CLOCK_MONOTONIC_RAW)
#define CLOCKTYPE CLOCK_MONOTONIC_RAW
#else
#define CLOCKTYPE CLOCK_MONOTONIC
#endif
static uint64_t millis_cache = -1; static uint64_t millis_cache = -1;
uint64_t frozen_timestamp( void ) uint64_t frozen_timestamp( void )
@@ -73,7 +83,7 @@ void freeze_timestamp( void )
// Check for presence, for OS X SDK >= 10.12 and runtime < 10.12 // Check for presence, for OS X SDK >= 10.12 and runtime < 10.12
&clock_gettime != NULL && &clock_gettime != NULL &&
#endif #endif
clock_gettime( CLOCK_MONOTONIC, &tp ) == 0 ) { clock_gettime( CLOCKTYPE, &tp ) == 0 ) {
uint64_t millis = tp.tv_nsec / 1000000; uint64_t millis = tp.tv_nsec / 1000000;
millis += uint64_t( tp.tv_sec ) * 1000; millis += uint64_t( tp.tv_sec ) * 1000;