diff options
| author | Alexander Kuleshov <kuleshovmail@gmail.com> | 2016-02-05 00:02:39 +0600 |
|---|---|---|
| committer | Alexander Kuleshov <kuleshovmail@gmail.com> | 2016-02-09 01:15:17 +0600 |
| commit | 5d634ca8cefb3d738d9efa70dfcc2f67d85d99e9 (patch) | |
| tree | ca648a970230dd03b23c976e055daa0a76c3efac /src/basic/time-util.c | |
| parent | ef9fde5378c0b2614991f9e3c4ac525cc07736a8 (diff) | |
time-util: introduce usec_sub()
The dual_timestamp_from_realtime(), dual_timestamp_from_monotonic()
and dual_timestamp_from_boottime_or_monotonic() shares the same
code for comparison given ts with delta. Let's move it to the
separate inline function to prevent code duplication.
Diffstat (limited to 'src/basic/time-util.c')
| -rw-r--r-- | src/basic/time-util.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 293442cf0e..17352a7a96 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; } |