From 868d2b9f6f11b3e837c132f039fe758f04666137 Mon Sep 17 00:00:00 2001 From: Alexey Avramov Date: Sat, 29 Jun 2019 19:58:35 +0900 Subject: [PATCH] update conf --- my_desktop.conf | 19 +++++++++---------- nohang.conf | 15 +++++++-------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/my_desktop.conf b/my_desktop.conf index a4e4b70..5c10c4c 100644 --- a/my_desktop.conf +++ b/my_desktop.conf @@ -201,13 +201,13 @@ oom_score_adj_max = 0 5.2 Matching CGroup-line (v1 and v2) with RE patterns -@BADNESS_ADJ_RE_CGROUP_V1 -50 /// ^/system.slice +@BADNESS_ADJ_RE_CGROUP_V1 -50 /// ^/system\.slice/ - @BADNESS_ADJ_RE_CGROUP_V1 50 /// foo.service + @BADNESS_ADJ_RE_CGROUP_V1 50 /// /foo\.service$ - @BADNESS_ADJ_RE_CGROUP_V1 -50 /// ^/user.slice + @BADNESS_ADJ_RE_CGROUP_V1 -50 /// ^/user\.slice/ - @BADNESS_ADJ_RE_CGROUP_V2 100 /// ^/workload + @BADNESS_ADJ_RE_CGROUP_V2 100 /// ^/workload 5.3 Matching eUIDs with RE patterns @@ -253,8 +253,8 @@ oom_score_adj_max = 0 @SOFT_ACTION_RE_NAME ^foo$ /// kill -SEGV $PID @SOFT_ACTION_RE_NAME ^bash$ /// kill -9 $PID - @SOFT_ACTION_RE_CGROUP_V1 ^/system.slice/ /// systemctl restart $SERVICE - @SOFT_ACTION_RE_CGROUP_V1 foo.service$ /// systemctl restart $SERVICE + @SOFT_ACTION_RE_CGROUP_V1 ^/system\.slice/ /// systemctl restart $SERVICE + @SOFT_ACTION_RE_CGROUP_V1 /foo\.service$ /// systemctl restart $SERVICE $PID will be replaced by process PID. $NAME will be replaced by process name. @@ -321,18 +321,17 @@ print_sleep_periods = False print_total_stat = True -print_proc_table = True +print_proc_table = False Valid values: None cgroup_v1 cgroup_v2 + realpath cmdline environ - realpath - All -extra_table_info = cgroup_v1 +extra_table_info = None print_victim_info = True diff --git a/nohang.conf b/nohang.conf index c9fccac..fd40a1e 100644 --- a/nohang.conf +++ b/nohang.conf @@ -199,11 +199,11 @@ oom_score_adj_max = 0 5.2. Matching CGroup_v1-line with RE patterns - @BADNESS_ADJ_RE_CGROUP_V1 -50 /// ^/system.slice + @BADNESS_ADJ_RE_CGROUP_V1 -50 /// ^/system\.slice/ - @BADNESS_ADJ_RE_CGROUP_V1 50 /// foo.service + @BADNESS_ADJ_RE_CGROUP_V1 50 /// /foo\.service$ - @BADNESS_ADJ_RE_CGROUP_V1 -50 /// ^/user.slice + @BADNESS_ADJ_RE_CGROUP_V1 -50 /// ^/user\.slice/ 5.3. Matching CGroup_v2-line with RE patterns @@ -249,8 +249,8 @@ oom_score_adj_max = 0 @SOFT_ACTION_RE_NAME ^foo$ /// kill -SEGV $PID @SOFT_ACTION_RE_NAME ^bash$ /// kill -9 $PID - @SOFT_ACTION_RE_CGROUP_V1 ^/system.slice/ /// systemctl restart $SERVICE - @SOFT_ACTION_RE_CGROUP_V1 foo.service$ /// systemctl restart $SERVICE + @SOFT_ACTION_RE_CGROUP_V1 ^/system\.slice/ /// systemctl restart $SERVICE + @SOFT_ACTION_RE_CGROUP_V1 /foo\.service$ /// systemctl restart $SERVICE $PID will be replaced by process PID. $NAME will be replaced by process name. @@ -323,12 +323,11 @@ print_proc_table = False None cgroup_v1 cgroup_v2 + realpath cmdline environ - realpath - All -extra_table_info = cgroup_v1 +extra_table_info = None print_victim_info = True