Skip to content

Commit 242d75b

Browse files
committed
cgroup-util: add ManagedOOMPreference enum to use between pid1 and oomd
1 parent 74f834e commit 242d75b

File tree

3 files changed

+20
-0
lines changed

3 files changed

+20
-0
lines changed

src/basic/cgroup-util.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2185,3 +2185,11 @@ static const char* const managed_oom_mode_table[_MANAGED_OOM_MODE_MAX] = {
21852185
};
21862186

21872187
DEFINE_STRING_TABLE_LOOKUP(managed_oom_mode, ManagedOOMMode);
2188+
2189+
static const char* const managed_oom_preference_table[_MANAGED_OOM_PREFERENCE_MAX] = {
2190+
[MANAGED_OOM_PREFERENCE_NONE] = "none",
2191+
[MANAGED_OOM_PREFERENCE_AVOID] = "avoid",
2192+
[MANAGED_OOM_PREFERENCE_OMIT] = "omit",
2193+
};
2194+
2195+
DEFINE_STRING_TABLE_LOOKUP(managed_oom_preference, ManagedOOMPreference);

src/basic/cgroup-util.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,3 +288,14 @@ typedef enum ManagedOOMMode {
288288

289289
const char* managed_oom_mode_to_string(ManagedOOMMode m) _const_;
290290
ManagedOOMMode managed_oom_mode_from_string(const char *s) _pure_;
291+
292+
typedef enum ManagedOOMPreference {
293+
MANAGED_OOM_PREFERENCE_NONE = 0,
294+
MANAGED_OOM_PREFERENCE_AVOID = 1,
295+
MANAGED_OOM_PREFERENCE_OMIT = 2,
296+
_MANAGED_OOM_PREFERENCE_MAX,
297+
_MANAGED_OOM_PREFERENCE_INVALID = -1
298+
} ManagedOOMPreference;
299+
300+
const char* managed_oom_preference_to_string(ManagedOOMPreference a) _const_;
301+
ManagedOOMPreference managed_oom_preference_from_string(const char *s) _pure_;

src/test/test-tables.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ int main(int argc, char **argv) {
7373
test_table(log_target, LOG_TARGET);
7474
test_table(mac_address_policy, MAC_ADDRESS_POLICY);
7575
test_table(managed_oom_mode, MANAGED_OOM_MODE);
76+
test_table(managed_oom_preference, MANAGED_OOM_PREFERENCE);
7677
test_table(manager_state, MANAGER_STATE);
7778
test_table(manager_timestamp, MANAGER_TIMESTAMP);
7879
test_table(mount_exec_command, MOUNT_EXEC_COMMAND);

0 commit comments

Comments
 (0)