From e2088e9fd7dd09c542d8c456b62dbd2d21ee9e51 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 15 Jun 2021 01:01:48 +0900 Subject: [PATCH 4/6] sd-event: use usec_add() (cherry picked from commit a595fb5ca9c69c589e758e9ebe3b70ac90450ba3) Related: #1984406 [commit b8732d647162b50ce9b34de2ad7ae11a53f6e7ba from https://github.com/systemd-rhel/rhel-8/ (branch rhel-8.4.0)] Signed-off-by: Li Zhou --- src/libsystemd/sd-event/sd-event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index 84a874d..1cf1c41 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -3677,8 +3677,8 @@ static int arm_watchdog(sd_event *e) { assert(e->watchdog_fd >= 0); t = sleep_between(e, - e->watchdog_last + (e->watchdog_period / 2), - e->watchdog_last + (e->watchdog_period * 3 / 4)); + usec_add(e->watchdog_last, (e->watchdog_period / 2)), + usec_add(e->watchdog_last, (e->watchdog_period * 3 / 4))); timespec_store(&its.it_value, t); -- 2.17.1