shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

timesync: use event_reset_time_relative()

Browse Source 
No functional change, just refactoring.
This commit is contained in:
Yu Watanabe 2025-02-25 13:00:56 +09:00
parent 1930f5afe6
commit 2960a8cfe8
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1184,22 +1184,24 @@ int manager_setup_save_time_event(Manager *m) {
int r;
assert(m);
assert(!m->event_save_time);
if (m->save_time_interval_usec == USEC_INFINITY)
return 0;
/* NB: we'll accumulate scheduling latencies here, but this doesn't matter */
r = sd_event_add_time_relative(
m->event, &m->event_save_time,
r = event_reset_time_relative(
m->event,
&m->event_save_time,
CLOCK_BOOTTIME,
m->save_time_interval_usec,
10 * USEC_PER_SEC,
manager_save_time_handler, m);
manager_save_time_handler,
m,
SD_EVENT_PRIORITY_NORMAL,
"save-time",
/* force_reset = */ false);
if (r < 0)
return log_error_errno(r, "Failed to add save time event: %m");
(void) sd_event_source_set_description(m->event_save_time, "save-time");
return log_error_errno(r, "Failed to reset event source for saving time: %m");
return 0;
}
@ -1219,17 +1221,7 @@ static int manager_save_time_and_rearm(Manager *m, usec_t t) {
m->save_on_exit = true;
if (m->save_time_interval_usec != USEC_INFINITY) {
r = sd_event_source_set_time_relative(m->event_save_time, m->save_time_interval_usec);
if (r < 0)
return log_error_errno(r, "Failed to rearm save time event: %m");
r = sd_event_source_set_enabled(m->event_save_time, SD_EVENT_ONESHOT);
if (r < 0)
return log_error_errno(r, "Failed to enable save time event: %m");
}
return 0;
return manager_setup_save_time_event(m);
}
static const char* ntp_server_property_name[_SERVER_TYPE_MAX] = {