From: Anita Zhang Date: Tue, 9 Feb 2021 10:05:11 +0000 (-0800) Subject: cgroup-util: add ManagedOOMPreference enum to use between pid1 and oomd X-Git-Tag: v248-rc1~142^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=242d75bdaaa6f222a47148f8a83cc425d6ceefb3;p=thirdparty%2Fsystemd.git cgroup-util: add ManagedOOMPreference enum to use between pid1 and oomd --- diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index b567822b7ef..bd4bedc38c2 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -2185,3 +2185,11 @@ static const char* const managed_oom_mode_table[_MANAGED_OOM_MODE_MAX] = { }; DEFINE_STRING_TABLE_LOOKUP(managed_oom_mode, ManagedOOMMode); + +static const char* const managed_oom_preference_table[_MANAGED_OOM_PREFERENCE_MAX] = { + [MANAGED_OOM_PREFERENCE_NONE] = "none", + [MANAGED_OOM_PREFERENCE_AVOID] = "avoid", + [MANAGED_OOM_PREFERENCE_OMIT] = "omit", +}; + +DEFINE_STRING_TABLE_LOOKUP(managed_oom_preference, ManagedOOMPreference); diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index bdc0d0d086c..0e6d27deada 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -288,3 +288,14 @@ typedef enum ManagedOOMMode { const char* managed_oom_mode_to_string(ManagedOOMMode m) _const_; ManagedOOMMode managed_oom_mode_from_string(const char *s) _pure_; + +typedef enum ManagedOOMPreference { + MANAGED_OOM_PREFERENCE_NONE = 0, + MANAGED_OOM_PREFERENCE_AVOID = 1, + MANAGED_OOM_PREFERENCE_OMIT = 2, + _MANAGED_OOM_PREFERENCE_MAX, + _MANAGED_OOM_PREFERENCE_INVALID = -1 +} ManagedOOMPreference; + +const char* managed_oom_preference_to_string(ManagedOOMPreference a) _const_; +ManagedOOMPreference managed_oom_preference_from_string(const char *s) _pure_; diff --git a/src/test/test-tables.c b/src/test/test-tables.c index 641cadec858..cc93bbbc749 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -73,6 +73,7 @@ int main(int argc, char **argv) { test_table(log_target, LOG_TARGET); test_table(mac_address_policy, MAC_ADDRESS_POLICY); test_table(managed_oom_mode, MANAGED_OOM_MODE); + test_table(managed_oom_preference, MANAGED_OOM_PREFERENCE); test_table(manager_state, MANAGER_STATE); test_table(manager_timestamp, MANAGER_TIMESTAMP); test_table(mount_exec_command, MOUNT_EXEC_COMMAND);