diff options
| -rw-r--r-- | src/basic/time-util.c | 26 | ||||
| -rw-r--r-- | src/basic/time-util.h | 11 |
2 files changed, 15 insertions, 22 deletions
diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 8c42df9b9f..3f3863910b 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -79,12 +79,7 @@ dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u) { ts->realtime = u; delta = (int64_t) now(CLOCK_REALTIME) - (int64_t) u; - ts->monotonic = now(CLOCK_MONOTONIC); - - if ((int64_t) ts->monotonic > delta) - ts->monotonic -= delta; - else - ts->monotonic = 0; + ts->monotonic = usec_sub(now(CLOCK_MONOTONIC), delta); return ts; } @@ -100,12 +95,7 @@ dual_timestamp* dual_timestamp_from_monotonic(dual_timestamp *ts, usec_t u) { ts->monotonic = u; delta = (int64_t) now(CLOCK_MONOTONIC) - (int64_t) u; - - ts->realtime = now(CLOCK_REALTIME); - if ((int64_t) ts->realtime > delta) - ts->realtime -= delta; - else - ts->realtime = 0; + ts->realtime = usec_sub(now(CLOCK_REALTIME), delta); return ts; } @@ -120,16 +110,8 @@ dual_timestamp* dual_timestamp_from_boottime_or_monotonic(dual_timestamp *ts, us dual_timestamp_get(ts); delta = (int64_t) now(clock_boottime_or_monotonic()) - (int64_t) u; - - if ((int64_t) ts->realtime > delta) - ts->realtime -= delta; - else - ts->realtime = 0; - - if ((int64_t) ts->monotonic > delta) - ts->monotonic -= delta; - else - ts->monotonic = 0; + ts->realtime = usec_sub(ts->realtime, delta); + ts->monotonic = usec_sub(ts->monotonic, delta); return ts; } diff --git a/src/basic/time-util.h b/src/basic/time-util.h index 9c7758a959..87440faeee 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -140,3 +140,14 @@ static inline usec_t usec_add(usec_t a, usec_t b) { return c; } + +static inline usec_t usec_sub(usec_t timestamp, int64_t delta) { + if (delta < 0) + timestamp = usec_add(timestamp, (usec_t) (-delta)); + else if (timestamp > (usec_t) delta) + timestamp -= delta; + else + timestamp = 0; + + return timestamp; +} |