uloop: use clock_gettime with the monotonic clock instead of using gettimeofday()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab82270915435b2c37b1573cbc3d2f8f74e22ccf..b75624774e81327ffdcf2d8ee35a5e35cb8d7a5a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
+INCLUDE(CheckLibraryExists)
+INCLUDE(CheckFunctionExists)
 
 PROJECT(ubox C)
 ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -Wmissing-declarations)
@@ -14,6 +16,16 @@ SET(SOURCES avl.c avl-cmp.c blob.c blobmsg.c uloop.c usock.c ustream.c ustream-f
 
 ADD_LIBRARY(ubox SHARED ${SOURCES})
 
+SET(LIBS)
+CHECK_FUNCTION_EXISTS(clock_gettime HAVE_GETTIME)
+IF(NOT HAVE_GETTIME)
+       CHECK_LIBRARY_EXISTS(rt clock_gettime "" NEED_GETTIME)
+       IF(NEED_GETTIME)
+               TARGET_LINK_LIBRARIES(ubox rt)
+       ENDIF()
+ENDIF()
+
+
 SET(CMAKE_INSTALL_PREFIX /usr)
 
 FILE(GLOB headers *.h)

diff --git a/uloop.c b/uloop.c
index ecf26ec185db87fadb0d2aa2cadacf6b1b4a0ae0..2de4feb1a1e391927b13bed4998fd93c4cbe5ff4 100644 (file)
--- a/uloop.c
+++ b/uloop.c
@@ -351,6 +351,15 @@ int uloop_timeout_add(struct uloop_timeout *timeout)
        return 0;
 }
 
+static void uloop_gettime(struct timeval *tv)
+{
+       struct timespec ts;
+
+       clock_gettime(CLOCK_MONOTONIC, &ts);
+       tv->tv_sec = ts.tv_sec;
+       tv->tv_usec = ts.tv_nsec / 1000;
+}
+
 int uloop_timeout_set(struct uloop_timeout *timeout, int msecs)
 {
        struct timeval *time = &timeout->time;
@@ -358,7 +367,7 @@ int uloop_timeout_set(struct uloop_timeout *timeout, int msecs)
        if (timeout->pending)
                uloop_timeout_cancel(timeout);
 
-       gettimeofday(&timeout->time, NULL);
+       uloop_gettime(&timeout->time);
 
        time->tv_sec += msecs / 1000;
        time->tv_usec += (msecs % 1000) * 1000;
@@ -521,7 +530,7 @@ void uloop_run(void)
        uloop_setup_signals();
        while(!uloop_cancelled)
        {
-               gettimeofday(&tv, NULL);
+               uloop_gettime(&tv);
                uloop_process_timeouts(&tv);
                if (uloop_cancelled)
                        break;