From: Zbigniew Jędrzejewski-Szmek Date: Fri, 27 Jun 2025 14:44:01 +0000 (+0200) Subject: shared/bus-unit-util: add helper for CPUQuotaPeriodSec=ManagedOOMMemoryPressureDurati... X-Git-Tag: v258-rc1~183^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbd4d4cc43ddfb6fc287786e130bcb192670c34b;p=thirdparty%2Fsystemd.git shared/bus-unit-util: add helper for CPUQuotaPeriodSec=ManagedOOMMemoryPressureDurationSec= --- diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index a40c0e9e73f..c03c8f375ca 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -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",