diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-04-18 03:45:42 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-06-16 10:12:57 +0200 |
| commit | d555d18278e004f0079a669150eb88dc210563c9 (patch) | |
| tree | dc33b55f521687b351b1daf365ffea92945cf118 /src | |
| parent | b95d5ee7e9a86cd3cd93ae2be366ddc64299f043 (diff) | |
tree-wide: fall back to now(CLOCK_MONOTONIC) if CLOCK_BOOTTIME unsupported (#3037)
It was added in 2.6.39, and causes an assertion to fail when running in mock
hosted on 2.6.32-based RHEL-6:
Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at elogind/src/basic/time-util.c:70, function now(). Aborting.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libelogind/sd-event/sd-event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libelogind/sd-event/sd-event.c b/src/libelogind/sd-event/sd-event.c index 34d91d844..52ecb8701 100644 --- a/src/libelogind/sd-event/sd-event.c +++ b/src/libelogind/sd-event/sd-event.c @@ -2547,7 +2547,7 @@ _public_ int sd_event_wait(sd_event *e, uint64_t timeout) { } dual_timestamp_get(&e->timestamp); - e->timestamp_boottime = now(CLOCK_BOOTTIME); + e->timestamp_boottime = now(clock_boottime_or_monotonic()); for (i = 0; i < m; i++) { |