moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

timeval: use mach time on MacOS

Browse Source 
If clock_gettime() is not supported, use mach_absolute_time() on MacOS.

closes #2033
This commit is contained in:
Dmitri Tikhonov 2017-10-30 08:12:41 -04:00 committed by Daniel Stenberg
parent e240a546a7
commit d531f33ba2
4 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -878,6 +878,7 @@ check_symbol_exists(setrlimit "${CURL_INCLUDES}" HAVE_SETRLIMIT)
check_symbol_exists(fcntl "${CURL_INCLUDES}" HAVE_FCNTL) check_symbol_exists(fcntl "${CURL_INCLUDES}" HAVE_FCNTL)
check_symbol_exists(ioctl "${CURL_INCLUDES}" HAVE_IOCTL) check_symbol_exists(ioctl "${CURL_INCLUDES}" HAVE_IOCTL)
check_symbol_exists(setsockopt "${CURL_INCLUDES}" HAVE_SETSOCKOPT) check_symbol_exists(setsockopt "${CURL_INCLUDES}" HAVE_SETSOCKOPT)
check_function_exists(mach_absolute_time HAVE_MACH_ABSOLUTE_TIME)
# symbol exists in win32, but function does not. # symbol exists in win32, but function does not.
if(WIN32) if(WIN32)

1
configure.ac
View File

@ -3385,6 +3385,7 @@ AC_CHECK_FUNCS([geteuid \
getrlimit \ getrlimit \
gettimeofday \ gettimeofday \
if_nametoindex \ if_nametoindex \
mach_absolute_time \
pipe \ pipe \
setlocale \ setlocale \
setmode \ setmode \

3
lib/curl_config.h.cmake
View File

@ -1000,3 +1000,6 @@
/* the signed version of size_t */ /* the signed version of size_t */
#cmakedefine ssize_t ${ssize_t} #cmakedefine ssize_t ${ssize_t}
/* Define to 1 if you have the mach_absolute_time function. */
#cmakedefine HAVE_MACH_ABSOLUTE_TIME 1

31
lib/timeval.c
View File

@ -84,6 +84,37 @@ struct curltime Curl_now(void)
return cnow; return cnow;
} }
#elif defined(HAVE_MACH_ABSOLUTE_TIME)
#include <stdint.h>
#include <mach/mach_time.h>
struct curltime Curl_now(void)
{
/*
** Monotonic timer on Mac OS is provided by mach_absolute_time(), which
** returns time in Mach "absolute time units," which are platform-dependent.
** To convert to nanoseconds, one must use conversion factors specified by
** mach_timebase_info().
*/
static mach_timebase_info_data_t timebase;
struct curltime cnow;
uint64_t usecs;
if(0 == timebase.denom)
(void) mach_timebase_info(&timebase);
usecs = mach_absolute_time();
usecs *= timebase.numer;
usecs /= timebase.denom;
usecs /= 1000;
cnow.tv_sec = usecs / 1000000;
cnow.tv_usec = usecs % 1000000;
return cnow;
}
#elif defined(HAVE_GETTIMEOFDAY) #elif defined(HAVE_GETTIMEOFDAY)
struct curltime Curl_now(void) struct curltime Curl_now(void)