1 From 7dba09af47dd3daa1562a6332a643a1a59dba4a8 Mon Sep 17 00:00:00 2001
2 From: Yann Collet <cyan@fb.com>
3 Date: Tue, 16 Jan 2018 10:21:37 -0800
4 Subject: [PATCH] use more restrictive conditions for clock_gettime()
6 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
8 Upstream status: commit 7dba09af47dd3
10 programs/util.h | 9 ++++++++-
11 1 file changed, 8 insertions(+), 1 deletion(-)
13 diff --git a/programs/util.h b/programs/util.h
14 index fc7f63e8140e..a3576d7e3a57 100644
17 @@ -141,6 +141,7 @@ extern "C" {
19 ******************************************/
20 #if defined(_WIN32) /* Windows */
22 typedef LARGE_INTEGER UTIL_time_t;
23 UTIL_STATIC UTIL_time_t UTIL_getTime(void) { UTIL_time_t x; QueryPerformanceCounter(&x); return x; }
24 UTIL_STATIC U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd)
25 @@ -165,7 +166,9 @@ extern "C" {
27 return 1000000000ULL*(clockEnd.QuadPart - clockStart.QuadPart)/ticksPerSecond.QuadPart;
30 #elif defined(__APPLE__) && defined(__MACH__)
32 #include <mach/mach_time.h>
33 typedef U64 UTIL_time_t;
34 UTIL_STATIC UTIL_time_t UTIL_getTime(void) { return mach_absolute_time(); }
35 @@ -189,7 +192,9 @@ extern "C" {
37 return ((clockEnd - clockStart) * (U64)rate.numer) / ((U64)rate.denom);
39 -#elif (PLATFORM_POSIX_VERSION >= 200112L)
41 +#elif (PLATFORM_POSIX_VERSION >= 200112L) && (defined __UCLIBC__ || ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 17) || __GLIBC__ > 2))
44 typedef struct timespec UTIL_time_t;
45 UTIL_STATIC UTIL_time_t UTIL_getTime(void)
46 @@ -227,7 +232,9 @@ extern "C" {
51 #else /* relies on standard C (note : clock_t measurements can be wrong when using multi-threading) */
53 typedef clock_t UTIL_time_t;
54 UTIL_STATIC UTIL_time_t UTIL_getTime(void) { return clock(); }
55 UTIL_STATIC U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd) { return 1000000ULL * (clockEnd - clockStart) / CLOCKS_PER_SEC; }