SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4131 from intelfx/update-done-timestamps-precision

Browse Source 
condition: ignore nanoseconds in timestamps for ConditionNeedsUpdate=

Fixes #4130.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2016-09-15 22:53:00 -04:00
committed by GitHub
parent 7dabbb55a8 fb8b0869a7
commit e77e0f51fe
4 changed files with 75 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/time-util.c
+1 -3
View File
@@ -40,8 +40,6 @@
#include "strv.h"
#include "time-util.h"
static nsec_t timespec_load_nsec(const struct timespec *ts);
static clockid_t map_clock_id(clockid_t c) {
/* Some more exotic archs (s390, ppc, …) lack the "ALARM" flavour of the clocks. Thus, clock_gettime() will
@@ -198,7 +196,7 @@ usec_t timespec_load(const struct timespec *ts) {
(usec_t) ts->tv_nsec / NSEC_PER_USEC;
}
static nsec_t timespec_load_nsec(const struct timespec *ts) {
nsec_t timespec_load_nsec(const struct timespec *ts) {
assert(ts);
if (ts->tv_sec == (time_t) -1 && ts->tv_nsec == (long) -1)
src/basic/time-util.h
+1
View File
@@ -111,6 +111,7 @@ static inline bool triple_timestamp_is_set(triple_timestamp *ts) {
usec_t triple_timestamp_by_clock(triple_timestamp *ts, clockid_t clock);
usec_t timespec_load(const struct timespec *ts) _pure_;
nsec_t timespec_load_nsec(const struct timespec *ts) _pure_;
struct timespec *timespec_store(struct timespec *ts, usec_t u);
usec_t timeval_load(const struct timeval *tv) _pure_;