shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-08 21:17:47 +03:00
Code

tree-wide: make use of new relative time events in sd-event.h

Browse Source
This commit is contained in:
Lennart Poettering 2020-07-28 11:18:26 +02:00
parent 4c5e74f71b
commit 39cf0351c5
20 changed files with 89 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/automount.c
View File

@ -709,25 +709,25 @@ static int automount_dispatch_expire(sd_event_source *source, usec_t usec, void
} }
static int automount_start_expire(Automount *a) { static int automount_start_expire(Automount *a) {
int r;
usec_t timeout; usec_t timeout;
int r;
assert(a); assert(a);
if (a->timeout_idle_usec == 0) if (a->timeout_idle_usec == 0)
return 0; return 0;
timeout = now(CLOCK_MONOTONIC) + MAX(a->timeout_idle_usec/3, USEC_PER_SEC); timeout = MAX(a->timeout_idle_usec/3, USEC_PER_SEC);
if (a->expire_event_source) { if (a->expire_event_source) {
r = sd_event_source_set_time(a->expire_event_source, timeout); r = sd_event_source_set_time_relative(a->expire_event_source, timeout);
if (r < 0) if (r < 0)
return r; return r;
return sd_event_source_set_enabled(a->expire_event_source, SD_EVENT_ONESHOT); return sd_event_source_set_enabled(a->expire_event_source, SD_EVENT_ONESHOT);
} }
r = sd_event_add_time( r = sd_event_add_time_relative(
UNIT(a)->manager->event, UNIT(a)->manager->event,
&a->expire_event_source, &a->expire_event_source,
CLOCK_MONOTONIC, timeout, 0, CLOCK_MONOTONIC, timeout, 0,

4
src/core/manager.c
View File

@ -2902,15 +2902,13 @@ static int manager_dispatch_idle_pipe_fd(sd_event_source *source, int fd, uint32
static int manager_dispatch_jobs_in_progress(sd_event_source *source, usec_t usec, void *userdata) { static int manager_dispatch_jobs_in_progress(sd_event_source *source, usec_t usec, void *userdata) {
Manager *m = userdata; Manager *m = userdata;
int r; int r;
uint64_t next;
assert(m); assert(m);
assert(source); assert(source);
manager_print_jobs_in_progress(m); manager_print_jobs_in_progress(m);
next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_PERIOD_USEC; r = sd_event_source_set_time_relative(source, JOBS_IN_PROGRESS_PERIOD_USEC);
r = sd_event_source_set_time(source, next);
if (r < 0) if (r < 0)
return r; return r;

6
src/import/curl-util.c
View File

@ -139,16 +139,16 @@ static int curl_glue_timer_callback(CURLM *curl, long timeout_ms, void *userdata
return 0; return 0;
} }
usec = now(clock_boottime_or_monotonic()) + (usec_t) timeout_ms * USEC_PER_MSEC + USEC_PER_MSEC - 1; usec = (usec_t) timeout_ms * USEC_PER_MSEC + USEC_PER_MSEC - 1;
if (g->timer) { if (g->timer) {
if (sd_event_source_set_time(g->timer, usec) < 0) if (sd_event_source_set_time_relative(g->timer, usec) < 0)
return -1; return -1;
if (sd_event_source_set_enabled(g->timer, SD_EVENT_ONESHOT) < 0) if (sd_event_source_set_enabled(g->timer, SD_EVENT_ONESHOT) < 0)
return -1; return -1;
} else { } else {
if (sd_event_add_time(g->event, &g->timer, clock_boottime_or_monotonic(), usec, 0, curl_glue_on_timer, g) < 0) if (sd_event_add_time_relative(g->event, &g->timer, clock_boottime_or_monotonic(), usec, 0, curl_glue_on_timer, g) < 0)
return -1; return -1;
(void) sd_event_source_set_description(g->timer, "curl-timer"); (void) sd_event_source_set_description(g->timer, "curl-timer");

9
src/journal/journal-file.c
View File

@ -1978,7 +1978,6 @@ static int post_change_thunk(sd_event_source *timer, uint64_t usec, void *userda
} }
static void schedule_post_change(JournalFile *f) { static void schedule_post_change(JournalFile *f) {
uint64_t now;
int r; int r;
assert(f); assert(f);
@ -1992,13 +1991,7 @@ static void schedule_post_change(JournalFile *f) {
if (r > 0) if (r > 0)
return; return;
r = sd_event_now(sd_event_source_get_event(f->post_change_timer), CLOCK_MONOTONIC, &now); r = sd_event_source_set_time_relative(f->post_change_timer, f->post_change_timer_period);
if (r < 0) {
log_debug_errno(r, "Failed to get clock's now for scheduling ftruncate: %m");
goto fail;
}
r = sd_event_source_set_time(f->post_change_timer, now + f->post_change_timer_period);
if (r < 0) { if (r < 0) {
log_debug_errno(r, "Failed to set time for scheduling ftruncate: %m"); log_debug_errno(r, "Failed to set time for scheduling ftruncate: %m");
goto fail; goto fail;

29
src/journal/journald-server.c
View File

@ -1677,27 +1677,20 @@ int server_schedule_sync(Server *s, int priority) {
return 0; return 0;
if (s->sync_interval_usec > 0) { if (s->sync_interval_usec > 0) {
usec_t when;
r = sd_event_now(s->event, CLOCK_MONOTONIC, &when);
if (r < 0)
return r;
when += s->sync_interval_usec;
if (!s->sync_event_source) { if (!s->sync_event_source) {
r = sd_event_add_time( r = sd_event_add_time_relative(
s->event, s->event,
&s->sync_event_source, &s->sync_event_source,
CLOCK_MONOTONIC, CLOCK_MONOTONIC,
when, 0, s->sync_interval_usec, 0,
server_dispatch_sync, s); server_dispatch_sync, s);
if (r < 0) if (r < 0)
return r; return r;
r = sd_event_source_set_priority(s->sync_event_source, SD_EVENT_PRIORITY_IMPORTANT); r = sd_event_source_set_priority(s->sync_event_source, SD_EVENT_PRIORITY_IMPORTANT);
} else { } else {
r = sd_event_source_set_time(s->sync_event_source, when); r = sd_event_source_set_time_relative(s->sync_event_source, s->sync_interval_usec);
if (r < 0) if (r < 0)
return r; return r;
@ -1888,7 +1881,7 @@ static int server_connect_notify(Server *s) {
if (sd_watchdog_enabled(false, &s->watchdog_usec) > 0) { if (sd_watchdog_enabled(false, &s->watchdog_usec) > 0) {
s->send_watchdog = true; s->send_watchdog = true;
r = sd_event_add_time(s->event, &s->watchdog_event_source, CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + s->watchdog_usec/2, s->watchdog_usec/4, dispatch_watchdog, s); r = sd_event_add_time_relative(s->event, &s->watchdog_event_source, CLOCK_MONOTONIC, s->watchdog_usec/2, s->watchdog_usec/4, dispatch_watchdog, s);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to add watchdog time event: %m"); return log_error_errno(r, "Failed to add watchdog time event: %m");
} }
@ -2116,7 +2109,6 @@ static int server_idle_handler(sd_event_source *source, uint64_t usec, void *use
int server_start_or_stop_idle_timer(Server *s) { int server_start_or_stop_idle_timer(Server *s) {
_cleanup_(sd_event_source_unrefp) sd_event_source *source = NULL; _cleanup_(sd_event_source_unrefp) sd_event_source *source = NULL;
usec_t when;
int r; int r;
assert(s); assert(s);
@ -2129,11 +2121,7 @@ int server_start_or_stop_idle_timer(Server *s) {
if (s->idle_event_source) if (s->idle_event_source)
return 1; return 1;
r = sd_event_now(s->event, CLOCK_MONOTONIC, &when); r = sd_event_add_time_relative(s->event, &source, CLOCK_MONOTONIC, IDLE_TIMEOUT_USEC, 0, server_idle_handler, s);
if (r < 0)
return log_error_errno(r, "Failed to determine current time: %m");
r = sd_event_add_time(s->event, &source, CLOCK_MONOTONIC, usec_add(when, IDLE_TIMEOUT_USEC), 0, server_idle_handler, s);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to allocate idle timer: %m"); return log_error_errno(r, "Failed to allocate idle timer: %m");
@ -2148,7 +2136,6 @@ int server_start_or_stop_idle_timer(Server *s) {
} }
int server_refresh_idle_timer(Server *s) { int server_refresh_idle_timer(Server *s) {
usec_t when;
int r; int r;
assert(s); assert(s);
@ -2156,11 +2143,7 @@ int server_refresh_idle_timer(Server *s) {
if (!s->idle_event_source) if (!s->idle_event_source)
return 0; return 0;
r = sd_event_now(s->event, CLOCK_MONOTONIC, &when); r = sd_event_source_set_time_relative(s->idle_event_source, IDLE_TIMEOUT_USEC);
if (r < 0)
return log_error_errno(r, "Failed to determine current time: %m");
r = sd_event_source_set_time(s->idle_event_source, usec_add(when, IDLE_TIMEOUT_USEC));
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to refresh idle timer: %m"); return log_error_errno(r, "Failed to refresh idle timer: %m");

10
src/libsystemd-network/test-dhcp-client.c
View File

@ -514,7 +514,6 @@ static int test_addr_acq_recv_discover(size_t size, DHCPMessage *discover) {
} }
static void test_addr_acq(sd_event *e) { static void test_addr_acq(sd_event *e) {
usec_t time_now = now(clock_boottime_or_monotonic());
sd_dhcp_client *client; sd_dhcp_client *client;
int res, r; int res, r;
@ -535,10 +534,11 @@ static void test_addr_acq(sd_event *e) {
callback_recv = test_addr_acq_recv_discover; callback_recv = test_addr_acq_recv_discover;
assert_se(sd_event_add_time(e, &test_hangcheck, assert_se(sd_event_add_time_relative(
clock_boottime_or_monotonic(), e, &test_hangcheck,
time_now + 2 * USEC_PER_SEC, 0, clock_boottime_or_monotonic(),
test_dhcp_hangcheck, NULL) >= 0); 2 * USEC_PER_SEC, 0,
test_dhcp_hangcheck, NULL) >= 0);
res = sd_dhcp_client_start(client); res = sd_dhcp_client_start(client);
assert_se(IN_SET(res, 0, -EINPROGRESS)); assert_se(IN_SET(res, 0, -EINPROGRESS));

7
src/libsystemd-network/test-dhcp6-client.c
View File

@ -888,7 +888,6 @@ int dhcp6_network_bind_udp_socket(int ifindex, struct in6_addr *local_address) {
static int test_client_solicit(sd_event *e) { static int test_client_solicit(sd_event *e) {
sd_dhcp6_client *client; sd_dhcp6_client *client;
usec_t time_now = now(clock_boottime_or_monotonic());
struct in6_addr address = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01 } } }; struct in6_addr address = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01 } } };
int val; int val;
@ -914,9 +913,9 @@ static int test_client_solicit(sd_event *e) {
assert_se(sd_dhcp6_client_set_callback(client, assert_se(sd_dhcp6_client_set_callback(client,
test_client_information_cb, e) >= 0); test_client_information_cb, e) >= 0);
assert_se(sd_event_add_time(e, &hangcheck, clock_boottime_or_monotonic(), assert_se(sd_event_add_time_relative(e, &hangcheck, clock_boottime_or_monotonic(),
time_now + 2 * USEC_PER_SEC, 0, 2 * USEC_PER_SEC, 0,
test_hangcheck, NULL) >= 0); test_hangcheck, NULL) >= 0);
assert_se(sd_dhcp6_client_set_local_address(client, &address) >= 0); assert_se(sd_dhcp6_client_set_local_address(client, &address) >= 0);

8
src/libsystemd-network/test-ndisc-ra.c
View File

@ -293,7 +293,6 @@ static int radv_recv(sd_event_source *s, int fd, uint32_t revents, void *userdat
static void test_ra(void) { static void test_ra(void) {
sd_event *e; sd_event *e;
sd_radv *ra; sd_radv *ra;
usec_t time_now = now(clock_boottime_or_monotonic());
unsigned i; unsigned i;
printf("* %s\n", __FUNCTION__); printf("* %s\n", __FUNCTION__);
@ -339,9 +338,10 @@ static void test_ra(void) {
assert_se(sd_event_add_io(e, &recv_router_advertisement, test_fd[0], assert_se(sd_event_add_io(e, &recv_router_advertisement, test_fd[0],
EPOLLIN, radv_recv, ra) >= 0); EPOLLIN, radv_recv, ra) >= 0);
assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(), assert_se(sd_event_add_time_relative(
time_now + 2 *USEC_PER_SEC, 0, e, &test_hangcheck, clock_boottime_or_monotonic(),
test_rs_hangcheck, NULL) >= 0); 2 *USEC_PER_SEC, 0,
test_rs_hangcheck, NULL) >= 0);
assert_se(sd_radv_start(ra) >= 0); assert_se(sd_radv_start(ra) >= 0);

16
src/libsystemd-network/test-ndisc-rs.c
View File

@ -272,7 +272,6 @@ static void test_callback(sd_ndisc *nd, sd_ndisc_event event, sd_ndisc_router *r
static void test_rs(void) { static void test_rs(void) {
sd_event *e; sd_event *e;
sd_ndisc *nd; sd_ndisc *nd;
usec_t time_now = now(clock_boottime_or_monotonic());
if (verbose) if (verbose)
printf("* %s\n", __FUNCTION__); printf("* %s\n", __FUNCTION__);
@ -290,9 +289,10 @@ static void test_rs(void) {
assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0); assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0);
assert_se(sd_ndisc_set_callback(nd, test_callback, e) >= 0); assert_se(sd_ndisc_set_callback(nd, test_callback, e) >= 0);
assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(), assert_se(sd_event_add_time_relative(
time_now + 2 *USEC_PER_SEC, 0, e, &test_hangcheck, clock_boottime_or_monotonic(),
test_rs_hangcheck, NULL) >= 0); 2 *USEC_PER_SEC, 0,
test_rs_hangcheck, NULL) >= 0);
assert_se(sd_ndisc_stop(nd) >= 0); assert_se(sd_ndisc_stop(nd) >= 0);
assert_se(sd_ndisc_start(nd) >= 0); assert_se(sd_ndisc_start(nd) >= 0);
@ -373,7 +373,6 @@ static int test_timeout_value(uint8_t flags) {
static void test_timeout(void) { static void test_timeout(void) {
sd_event *e; sd_event *e;
sd_ndisc *nd; sd_ndisc *nd;
usec_t time_now = now(clock_boottime_or_monotonic());
if (verbose) if (verbose)
printf("* %s\n", __FUNCTION__); printf("* %s\n", __FUNCTION__);
@ -392,9 +391,10 @@ static void test_timeout(void) {
assert_se(sd_ndisc_set_ifindex(nd, 42) >= 0); assert_se(sd_ndisc_set_ifindex(nd, 42) >= 0);
assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0); assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0);
assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(), assert_se(sd_event_add_time_relative(
time_now + 2U * USEC_PER_SEC, 0, e, &test_hangcheck, clock_boottime_or_monotonic(),
test_rs_hangcheck, NULL) >= 0); 2U * USEC_PER_SEC, 0,
test_rs_hangcheck, NULL) >= 0);
assert_se(sd_ndisc_start(nd) >= 0); assert_se(sd_ndisc_start(nd) >= 0);

14
src/login/logind-dbus.c
View File

@ -1720,26 +1720,26 @@ static int delay_shutdown_or_sleep(
const char *unit_name) { const char *unit_name) {
int r; int r;
usec_t timeout_val;
assert(m); assert(m);
assert(w >= 0); assert(w >= 0);
assert(w < _INHIBIT_WHAT_MAX); assert(w < _INHIBIT_WHAT_MAX);
assert(unit_name); assert(unit_name);
timeout_val = now(CLOCK_MONOTONIC) + m->inhibit_delay_max;
if (m->inhibit_timeout_source) { if (m->inhibit_timeout_source) {
r = sd_event_source_set_time(m->inhibit_timeout_source, timeout_val); r = sd_event_source_set_time_relative(m->inhibit_timeout_source, m->inhibit_delay_max);
if (r < 0) if (r < 0)
return log_error_errno(r, "sd_event_source_set_time() failed: %m"); return log_error_errno(r, "sd_event_source_set_time_relative() failed: %m");
r = sd_event_source_set_enabled(m->inhibit_timeout_source, SD_EVENT_ONESHOT); r = sd_event_source_set_enabled(m->inhibit_timeout_source, SD_EVENT_ONESHOT);
if (r < 0) if (r < 0)
return log_error_errno(r, "sd_event_source_set_enabled() failed: %m"); return log_error_errno(r, "sd_event_source_set_enabled() failed: %m");
} else { } else {
r = sd_event_add_time(m->event, &m->inhibit_timeout_source, CLOCK_MONOTONIC, r = sd_event_add_time_relative(
timeout_val, 0, manager_inhibit_timeout_handler, m); m->event,
&m->inhibit_timeout_source,
CLOCK_MONOTONIC, m->inhibit_delay_max, 0,
manager_inhibit_timeout_handler, m);
if (r < 0) if (r < 0)
return r; return r;
} }

11
src/login/logind-session.c
View File

@ -896,11 +896,12 @@ int session_release(Session *s) {
if (s->timer_event_source) if (s->timer_event_source)
return 0; return 0;
return sd_event_add_time(s->manager->event, return sd_event_add_time_relative(
&s->timer_event_source, s->manager->event,
CLOCK_MONOTONIC, &s->timer_event_source,
usec_add(now(CLOCK_MONOTONIC), RELEASE_USEC), 0, CLOCK_MONOTONIC,
release_timeout_callback, s); RELEASE_USEC, 0,
release_timeout_callback, s);
} }
bool session_is_active(Session *s) { bool session_is_active(Session *s) {

8
src/network/networkd-lldp-tx.c
View File

@ -332,7 +332,7 @@ static int link_send_lldp(Link *link) {
static int on_lldp_timer(sd_event_source *s, usec_t t, void *userdata) { static int on_lldp_timer(sd_event_source *s, usec_t t, void *userdata) {
Link *link = userdata; Link *link = userdata;
usec_t current, delay, next; usec_t delay;
int r; int r;
assert(s); assert(s);
@ -347,12 +347,10 @@ static int on_lldp_timer(sd_event_source *s, usec_t t, void *userdata) {
if (link->lldp_tx_fast > 0) if (link->lldp_tx_fast > 0)
link->lldp_tx_fast--; link->lldp_tx_fast--;
assert_se(sd_event_now(sd_event_source_get_event(s), clock_boottime_or_monotonic(), &current) >= 0);
delay = link->lldp_tx_fast > 0 ? LLDP_FAST_TX_USEC : LLDP_TX_INTERVAL_USEC; delay = link->lldp_tx_fast > 0 ? LLDP_FAST_TX_USEC : LLDP_TX_INTERVAL_USEC;
next = usec_add(usec_add(current, delay), (usec_t) random_u64() % LLDP_JITTER_USEC); delay = usec_add(delay, (usec_t) random_u64() % LLDP_JITTER_USEC);
r = sd_event_source_set_time(s, next); r = sd_event_source_set_time_relative(s, delay);
if (r < 0) if (r < 0)
return log_link_error_errno(link, r, "Failed to restart LLDP timer: %m"); return log_link_error_errno(link, r, "Failed to restart LLDP timer: %m");

4
src/resolve/resolved-dns-query.c
View File

@ -687,11 +687,11 @@ int dns_query_go(DnsQuery *q) {
dns_query_reset_answer(q); dns_query_reset_answer(q);
r = sd_event_add_time( r = sd_event_add_time_relative(
q->manager->event, q->manager->event,
&q->timeout_event_source, &q->timeout_event_source,
clock_boottime_or_monotonic(), clock_boottime_or_monotonic(),
now(clock_boottime_or_monotonic()) + SD_RESOLVED_QUERY_TIMEOUT_USEC, SD_RESOLVED_QUERY_TIMEOUT_USEC,
0, on_query_timeout, q); 0, on_query_timeout, q);
if (r < 0) if (r < 0)
goto fail; goto fail;

22
src/resolve/resolved-dns-scope.c
View File

@ -1059,12 +1059,13 @@ int dns_scope_notify_conflict(DnsScope *scope, DnsResourceRecord *rr) {
random_bytes(&jitter, sizeof(jitter)); random_bytes(&jitter, sizeof(jitter));
jitter %= LLMNR_JITTER_INTERVAL_USEC; jitter %= LLMNR_JITTER_INTERVAL_USEC;
r = sd_event_add_time(scope->manager->event, r = sd_event_add_time_relative(
&scope->conflict_event_source, scope->manager->event,
clock_boottime_or_monotonic(), &scope->conflict_event_source,
now(clock_boottime_or_monotonic()) + jitter, clock_boottime_or_monotonic(),
LLMNR_JITTER_INTERVAL_USEC, jitter,
on_conflict_dispatch, scope); LLMNR_JITTER_INTERVAL_USEC,
on_conflict_dispatch, scope);
if (r < 0) if (r < 0)
return log_debug_errno(r, "Failed to add conflict dispatch event: %m"); return log_debug_errno(r, "Failed to add conflict dispatch event: %m");
@ -1318,18 +1319,13 @@ int dns_scope_announce(DnsScope *scope, bool goodbye) {
/* In section 8.3 of RFC6762: "The Multicast DNS responder MUST send at least two unsolicited /* In section 8.3 of RFC6762: "The Multicast DNS responder MUST send at least two unsolicited
* responses, one second apart." */ * responses, one second apart." */
if (!scope->announced) { if (!scope->announced) {
usec_t ts;
scope->announced = true; scope->announced = true;
assert_se(sd_event_now(scope->manager->event, clock_boottime_or_monotonic(), &ts) >= 0); r = sd_event_add_time_relative(
ts += MDNS_ANNOUNCE_DELAY;
r = sd_event_add_time(
scope->manager->event, scope->manager->event,
&scope->announce_event_source, &scope->announce_event_source,
clock_boottime_or_monotonic(), clock_boottime_or_monotonic(),
ts, MDNS_ANNOUNCE_DELAY,
MDNS_JITTER_RANGE_USEC, MDNS_JITTER_RANGE_USEC,
on_announcement_timeout, scope); on_announcement_timeout, scope);
if (r < 0) if (r < 0)

6
src/resolve/resolved-dns-stream.c
View File

@ -445,7 +445,7 @@ static int on_stream_io(sd_event_source *es, int fd, uint32_t revents, void *use
/* If we did something, let's restart the timeout event source */ /* If we did something, let's restart the timeout event source */
if (progressed && s->timeout_event_source) { if (progressed && s->timeout_event_source) {
r = sd_event_source_set_time(s->timeout_event_source, now(clock_boottime_or_monotonic()) + DNS_STREAM_TIMEOUT_USEC); r = sd_event_source_set_time_relative(s->timeout_event_source, DNS_STREAM_TIMEOUT_USEC);
if (r < 0) if (r < 0)
log_warning_errno(errno, "Couldn't restart TCP connection timeout, ignoring: %m"); log_warning_errno(errno, "Couldn't restart TCP connection timeout, ignoring: %m");
} }
@ -528,11 +528,11 @@ int dns_stream_new(
(void) sd_event_source_set_description(s->io_event_source, "dns-stream-io"); (void) sd_event_source_set_description(s->io_event_source, "dns-stream-io");
r = sd_event_add_time( r = sd_event_add_time_relative(
m->event, m->event,
&s->timeout_event_source, &s->timeout_event_source,
clock_boottime_or_monotonic(), clock_boottime_or_monotonic(),
now(clock_boottime_or_monotonic()) + DNS_STREAM_TIMEOUT_USEC, 0, DNS_STREAM_TIMEOUT_USEC, 0,
on_stream_timeout, s); on_stream_timeout, s);
if (r < 0) if (r < 0)
return r; return r;

7
src/shared/udev-util.c
View File

@ -182,9 +182,10 @@ int device_wait_for_initialization(sd_device *device, const char *subsystem, use
return log_error_errno(r, "Failed to start device monitor: %m"); return log_error_errno(r, "Failed to start device monitor: %m");
if (timeout != USEC_INFINITY) { if (timeout != USEC_INFINITY) {
r = sd_event_add_time(event, &timeout_source, r = sd_event_add_time_relative(
CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + timeout, 0, event, &timeout_source,
device_timeout_handler, NULL); CLOCK_MONOTONIC, timeout, 0,
device_timeout_handler, NULL);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to add timeout event source: %m"); return log_error_errno(r, "Failed to add timeout event source: %m");
} }

11
src/socket-proxy/socket-proxyd.c
View File

@ -95,16 +95,14 @@ static int idle_time_cb(sd_event_source *s, uint64_t usec, void *userdata) {
} }
static int connection_release(Connection *c) { static int connection_release(Connection *c) {
int r;
Context *context = c->context; Context *context = c->context;
usec_t idle_instant; int r;
connection_free(c); connection_free(c);
if (arg_exit_idle_time < USEC_INFINITY && set_isempty(context->connections)) { if (arg_exit_idle_time < USEC_INFINITY && set_isempty(context->connections)) {
idle_instant = usec_add(now(CLOCK_MONOTONIC), arg_exit_idle_time);
if (context->idle_time) { if (context->idle_time) {
r = sd_event_source_set_time(context->idle_time, idle_instant); r = sd_event_source_set_time_relative(context->idle_time, arg_exit_idle_time);
if (r < 0) if (r < 0)
return log_error_errno(r, "Error while setting idle time: %m"); return log_error_errno(r, "Error while setting idle time: %m");
@ -112,8 +110,9 @@ static int connection_release(Connection *c) {
if (r < 0) if (r < 0)
return log_error_errno(r, "Error while enabling idle time: %m"); return log_error_errno(r, "Error while enabling idle time: %m");
} else { } else {
r = sd_event_add_time(context->event, &context->idle_time, CLOCK_MONOTONIC, r = sd_event_add_time_relative(
idle_instant, 0, idle_time_cb, context); context->event, &context->idle_time, CLOCK_MONOTONIC,
arg_exit_idle_time, 0, idle_time_cb, context);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to create idle timer: %m"); return log_error_errno(r, "Failed to create idle timer: %m");
} }

10
src/timesync/timesyncd-manager.c
View File

@ -181,18 +181,18 @@ static int manager_arm_timer(Manager *m, usec_t next) {
} }
if (m->event_timer) { 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) if (r < 0)
return r; return r;
return sd_event_source_set_enabled(m->event_timer, SD_EVENT_ONESHOT); 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,
&m->event_timer, &m->event_timer,
clock_boottime_or_monotonic(), clock_boottime_or_monotonic(),
now(clock_boottime_or_monotonic()) + next, 0, next, 0,
manager_timer, m); manager_timer, m);
} }
@ -787,7 +787,7 @@ int manager_connect(Manager *m) {
if (!ratelimit_below(&m->ratelimit)) { if (!ratelimit_below(&m->ratelimit)) {
log_debug("Delaying attempts to contact servers."); 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) if (r < 0)
return log_error_errno(r, "Failed to create retry timer: %m"); 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) { if (restart && !m->exhausted_servers && m->poll_interval_usec) {
log_debug("Waiting after exhausting servers."); 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) if (r < 0)
return log_error_errno(r, "Failed to create retry timer: %m"); return log_error_errno(r, "Failed to create retry timer: %m");

7
src/udev/udev-ctrl.c
View File

@ -392,9 +392,10 @@ int udev_ctrl_wait(struct udev_ctrl *uctrl, usec_t timeout) {
(void) sd_event_source_set_description(source_io, "udev-ctrl-wait-io"); (void) sd_event_source_set_description(source_io, "udev-ctrl-wait-io");
if (timeout != USEC_INFINITY) { if (timeout != USEC_INFINITY) {
r = sd_event_add_time(uctrl->event, &source_timeout, clock_boottime_or_monotonic(), r = sd_event_add_time_relative(
usec_add(now(clock_boottime_or_monotonic()), timeout), uctrl->event, &source_timeout, clock_boottime_or_monotonic(),
0, NULL, INT_TO_PTR(-ETIMEDOUT)); timeout,
0, NULL, INT_TO_PTR(-ETIMEDOUT));
if (r < 0) if (r < 0)
return r; return r;

13
src/udev/udevd.c
View File

@ -251,7 +251,6 @@ static int on_event_timeout_warning(sd_event_source *s, uint64_t usec, void *use
static void worker_attach_event(struct worker *worker, struct event *event) { static void worker_attach_event(struct worker *worker, struct event *event) {
sd_event *e; sd_event *e;
uint64_t usec;
assert(worker); assert(worker);
assert(worker->manager); assert(worker->manager);
@ -266,13 +265,13 @@ static void worker_attach_event(struct worker *worker, struct event *event) {
e = worker->manager->event; e = worker->manager->event;
assert_se(sd_event_now(e, CLOCK_MONOTONIC, &usec) >= 0); (void) sd_event_add_time_relative(e, &event->timeout_warning_event, CLOCK_MONOTONIC,
udev_warn_timeout(arg_event_timeout_usec), USEC_PER_SEC,
on_event_timeout_warning, event);
(void) sd_event_add_time(e, &event->timeout_warning_event, CLOCK_MONOTONIC, (void) sd_event_add_time_relative(e, &event->timeout_event, CLOCK_MONOTONIC,
usec + udev_warn_timeout(arg_event_timeout_usec), USEC_PER_SEC, on_event_timeout_warning, event); arg_event_timeout_usec, USEC_PER_SEC,
on_event_timeout, event);
(void) sd_event_add_time(e, &event->timeout_event, CLOCK_MONOTONIC,
usec + arg_event_timeout_usec, USEC_PER_SEC, on_event_timeout, event);
} }
static void manager_clear_for_worker(Manager *manager) { static void manager_clear_for_worker(Manager *manager) {