From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 2 Feb 2023 12:01:24 +0000 (+0100)
Subject: sleep: use shared constant for freeze timeout
X-Git-Tag: v254-rc1~1225^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f274f8bf256702c5fd0c68d3f7bd6aeba74dfcf0;p=thirdparty%2Fsystemd.git

sleep: use shared constant for freeze timeout

Let's keep all the timeout definitions in one place.
---

diff --git a/src/basic/constants.h b/src/basic/constants.h
index 5d68cc63320..3e935f1bcaa 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 9c51a3367f4..9018188cba0 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)