From f274f8bf256702c5fd0c68d3f7bd6aeba74dfcf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 2 Feb 2023 13:01:24 +0100 Subject: [PATCH] sleep: use shared constant for freeze timeout Let's keep all the timeout definitions in one place. --- src/basic/constants.h | 3 +++ src/sleep/sleep.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/basic/constants.h b/src/basic/constants.h index 5d68cc6332..3e935f1bca 100644 --- a/src/basic/constants.h +++ b/src/basic/constants.h @@ -42,6 +42,9 @@ #define DEFAULT_START_LIMIT_INTERVAL (10*USEC_PER_SEC) #define DEFAULT_START_LIMIT_BURST 5 +/* Wait for 1.5 seconds at maximum for freeze operation */ +#define FREEZE_TIMEOUT (1500 * USEC_PER_MSEC) + /* The default time after which exit-on-idle services exit. This * should be kept lower than the watchdog timeout, because otherwise * the watchdog pings will keep the loop busy. */ diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 9c51a3367f..9018188cba 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -382,8 +382,7 @@ static int freeze_thaw_user_slice(const char **method) { if (r < 0) return log_debug_errno(r, "Failed to open connection to systemd: %m"); - /* Wait for 1.5 seconds at maximum for freeze operation */ - (void) sd_bus_set_method_call_timeout(bus, 1500 * USEC_PER_MSEC); + (void) sd_bus_set_method_call_timeout(bus, FREEZE_TIMEOUT); r = bus_call_method(bus, bus_systemd_mgr, *method, &error, NULL, "s", SPECIAL_USER_SLICE); if (r < 0)