diff options
| author | Mika Fischer <mika.fischer@zoopnet.de> | 2011-12-03 13:07:30 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2011-12-03 13:07:30 +0100 |
| commit | aaac96d94a81fb5debe24200e20c353217baec9c (patch) | |
| tree | 49d280f14a7a4c216abf281d3e4c722f79278b41 | |
| parent | fc17bd4117c19b027790951ac1df1a141bce9d82 (diff) | |
This makes clock_t insensitive to the system clock being reset by NTP or
the sysadmin, which could previously cause long hangs for instance in
zmq_poll.
Signed-off-by: Mika Fischer <mika.fischer@zoopnet.de>
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | src/clock.cpp | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 9006f03..d385dcc 100644 --- a/configure.in +++ b/configure.in @@ -91,6 +91,7 @@ case "${host_os}" in CPPFLAGS="-D_GNU_SOURCE $CPPFLAGS" fi AC_DEFINE(ZMQ_HAVE_LINUX, 1, [Have Linux OS]) + AC_CHECK_LIB(rt, clock_gettime) case "${host_os}" in *android*) @@ -238,7 +239,7 @@ LIBZMQ_CHECK_POLLER([CPPFLAGS="${CPPFLAGS} -D${libzmq_cv_poller_flag}"], # Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS(errno.h arpa/inet.h netinet/tcp.h netinet/in.h stddef.h \ -stdlib.h string.h sys/socket.h sys/time.h unistd.h limits.h) +stdlib.h string.h sys/socket.h sys/time.h time.h unistd.h limits.h) # Check if we have ifaddrs.h header file. AC_CHECK_HEADERS(ifaddrs.h, [AC_DEFINE(ZMQ_HAVE_IFADDRS, 1, [Have ifaddrs.h header.])]) @@ -370,7 +371,7 @@ AM_CONDITIONAL(ON_MINGW, test "x$libzmq_on_mingw32" = "xyes") # Checks for library functions. AC_TYPE_SIGNAL -AC_CHECK_FUNCS(perror gettimeofday memset socket getifaddrs freeifaddrs) +AC_CHECK_FUNCS(perror gettimeofday clock_gettime memset socket getifaddrs freeifaddrs) AC_CHECK_HEADERS([alloca.h]) LIBZMQ_CHECK_SOCK_CLOEXEC([AC_DEFINE( [ZMQ_HAVE_SOCK_CLOEXEC], diff --git a/src/clock.cpp b/src/clock.cpp index 92fc4be..4868a5f 100644 --- a/src/clock.cpp +++ b/src/clock.cpp @@ -34,6 +34,10 @@ #include <sys/time.h> #endif +#if defined HAVE_CLOCK_GETTIME +#include <time.h> +#endif + zmq::clock_t::clock_t () : last_tsc (rdtsc ()), last_time (now_us () / 1000) @@ -61,6 +65,14 @@ uint64_t zmq::clock_t::now_us () double ticks_div = (double) (ticksPerSecond.QuadPart / 1000000); return (uint64_t) (tick.QuadPart / ticks_div); +#elif defined HAVE_CLOCK_GETTIME + + // Use POSIX clock_gettime function to get precise monotonic time. + struct timespec tv; + int rc = clock_gettime (CLOCK_MONOTONIC, &tv); + errno_assert (rc == 0); + return (tv.tv_sec * (uint64_t) 1000000 + tv.tv_nsec / 1000); + #else // Use POSIX gettimeofday function to get precise time. |