From 77ff2de999b7ea6b1b4a3a218fbd9d62bb07cd54 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 24 Jul 2014 18:36:37 +0200 Subject: [PATCH] time-util: add clock_boottime_or_monotonic CLOCK_BOOTTIME is not supported by timerfd on older kernels, so for the time beeing, use this helper instead which will fallback to CLOCK_MONOTONIC if CLOCK_BOOTTIME is not supported. --- src/shared/time-util.c | 19 +++++++++++++++++++ src/shared/time-util.h | 2 ++ 2 files changed, 21 insertions(+) diff --git a/src/shared/time-util.c b/src/shared/time-util.c index fc79c569f..76ab143f3 100644 --- a/src/shared/time-util.c +++ b/src/shared/time-util.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "util.h" #include "time-util.h" @@ -929,3 +930,21 @@ bool timezone_is_valid(const char *name) { return true; } + +clockid_t clock_boottime_or_monotonic(void) { + static clockid_t clock = -1; + int fd; + + if (clock != -1) + return clock; + + fd = timerfd_create(CLOCK_BOOTTIME, TFD_NONBLOCK|TFD_CLOEXEC); + if (fd < 0) + clock = CLOCK_MONOTONIC; + else { + safe_close(fd); + clock = CLOCK_BOOTTIME; + } + + return clock; +} diff --git a/src/shared/time-util.h b/src/shared/time-util.h index 792cd2748..69a48c686 100644 --- a/src/shared/time-util.h +++ b/src/shared/time-util.h @@ -98,3 +98,5 @@ bool ntp_synced(void); int get_timezones(char ***l); bool timezone_is_valid(const char *name); + +clockid_t clock_boottime_or_monotonic(void); -- 2.30.2