]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
shared/bus-unit-util: add helper for CPUQuotaPeriodSec=ManagedOOMMemoryPressureDurati...
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 27 Jun 2025 14:44:01 +0000 (16:44 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 3 Jul 2025 17:53:40 +0000 (19:53 +0200)
src/shared/bus-unit-util.c

index a40c0e9e73f85d3c499eeb054e03427941a89caa..c03c8f375ca77f20511f54c111f274ebd2ef762b 100644 (file)
@@ -262,6 +262,10 @@ static int bus_append_parse_sec_rename(sd_bus_message *m, const char *field, con
         return 1;
 }
 
+static int bus_append_parse_sec_rename_infinity(sd_bus_message *m, const char *field, const char *eq) {
+        return bus_append_parse_sec_rename(m, field, isempty(eq) ? "infinity" : eq);
+}
+
 static int bus_append_parse_size(sd_bus_message *m, const char *field, const char *eq, uint64_t base) {
         uint64_t v;
         int r;
@@ -2334,7 +2338,7 @@ static int bus_append_cgroup_property(sd_bus_message *m, const char *field, cons
                 return bus_append_parse_cpu_quota(m, field, eq);
 
         if (streq(field, "CPUQuotaPeriodSec"))
-                return bus_append_parse_sec_rename(m, field, isempty(eq) ? "infinity" : eq);
+                return bus_append_parse_sec_rename_infinity(m, field, eq);
 
         if (streq(field, "DeviceAllow"))
                 return bus_append_parse_device_allow(m, field, eq);
@@ -2372,7 +2376,7 @@ static int bus_append_cgroup_property(sd_bus_message *m, const char *field, cons
         if (streq(field, "ManagedOOMMemoryPressureDurationSec"))
                 /* While infinity is disallowed in unit file, infinity is allowed in D-Bus API which
                  * means use the default memory pressure duration from oomd.conf. */
-                return bus_append_parse_sec_rename(m, field, isempty(eq) ? "infinity" : eq);
+                return bus_append_parse_sec_rename_infinity(m, field, eq);
 
         if (STR_IN_SET(field,
                        "MemoryLimit",