diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-07-28 11:18:26 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-07-28 11:24:55 +0200 |
| commit | 39cf0351c529584aa8f270e3b418d7ab9461b622 (patch) | |
| tree | 11c5fcdc23e9f6f8b9d9782878fd542fa42f3f2c /src/timesync | |
| parent | 4c5e74f71be6dab3d064690672cb84737b198be5 (diff) | |
| download | systemd-39cf0351c529584aa8f270e3b418d7ab9461b622.tar.gz | |
tree-wide: make use of new relative time events in sd-event.h
Diffstat (limited to 'src/timesync')
| -rw-r--r-- | src/timesync/timesyncd-manager.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index dadf213a80..e4d065df59 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -181,18 +181,18 @@ static int manager_arm_timer(Manager *m, usec_t next) { } if (m->event_timer) { - r = sd_event_source_set_time(m->event_timer, now(clock_boottime_or_monotonic()) + next); + r = sd_event_source_set_time_relative(m->event_timer, next); if (r < 0) return r; return sd_event_source_set_enabled(m->event_timer, SD_EVENT_ONESHOT); } - return sd_event_add_time( + return sd_event_add_time_relative( m->event, &m->event_timer, clock_boottime_or_monotonic(), - now(clock_boottime_or_monotonic()) + next, 0, + next, 0, manager_timer, m); } @@ -787,7 +787,7 @@ int manager_connect(Manager *m) { if (!ratelimit_below(&m->ratelimit)) { log_debug("Delaying attempts to contact servers."); - r = sd_event_add_time(m->event, &m->event_retry, clock_boottime_or_monotonic(), now(clock_boottime_or_monotonic()) + RETRY_USEC, 0, manager_retry_connect, m); + r = sd_event_add_time_relative(m->event, &m->event_retry, clock_boottime_or_monotonic(), RETRY_USEC, 0, manager_retry_connect, m); if (r < 0) return log_error_errno(r, "Failed to create retry timer: %m"); @@ -841,7 +841,7 @@ int manager_connect(Manager *m) { if (restart && !m->exhausted_servers && m->poll_interval_usec) { log_debug("Waiting after exhausting servers."); - r = sd_event_add_time(m->event, &m->event_retry, clock_boottime_or_monotonic(), now(clock_boottime_or_monotonic()) + m->poll_interval_usec, 0, manager_retry_connect, m); + r = sd_event_add_time_relative(m->event, &m->event_retry, clock_boottime_or_monotonic(), m->poll_interval_usec, 0, manager_retry_connect, m); if (r < 0) return log_error_errno(r, "Failed to create retry timer: %m"); |