From 12663295ca7fbff951c6f9747daecadc593f4c93 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 6 Sep 2021 11:06:35 +0200 Subject: [PATCH] core: watchdog_runtimeout_wait() already returns USEC_INFINITY when the watchdog is disabled or closed --- src/core/manager.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c index b767b0ee6c5..7d3602c71cd 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -2978,7 +2978,7 @@ int manager_loop(Manager *m) { return log_error_errno(r, "Failed to enable SIGCHLD event source: %m"); while (m->objective == MANAGER_OK) { - usec_t wait_usec, watchdog_usec; + usec_t watchdog_usec; watchdog_usec = manager_get_watchdog(m, WATCHDOG_RUNTIME); if (m->runtime_watchdog_running) @@ -3020,12 +3020,7 @@ int manager_loop(Manager *m) { continue; /* Sleep for watchdog runtime wait time */ - if (timestamp_is_set(watchdog_usec)) - wait_usec = watchdog_runtime_wait(); - else - wait_usec = USEC_INFINITY; - - r = sd_event_run(m->event, wait_usec); + r = sd_event_run(m->event, watchdog_runtime_wait()); if (r < 0) return log_error_errno(r, "Failed to run event loop: %m"); } -- 2.47.3