emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rc-cgroup.sh: move cgroup_cleanup to the end of the file

Browse Source
This commit is contained in:
William Hubbs
2017-09-14 10:44:52 -05:00
parent 6d7713a758
commit 8885580986
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sh/rc-cgroup.sh.in
View File

@@ -134,25 +134,6 @@ cgroup_set_limits()
return 0 return 0
} }
cgroup_cleanup()
{
cgroup_running || return 0
ebegin "starting cgroups cleanup"
for sig in TERM QUIT INT; do
cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
for i in 0 1; do
kill -s $sig $pids
for j in 0 1 2; do
cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
sleep 1
done
done 2>/dev/null
done
cgroup_get_pids || { eend 0 "finished" ; return 0; }
kill -9 $pids
eend $(cgroup_running && echo 1 || echo 0) "fail to stop all processes"
}
cgroup2_find_path() cgroup2_find_path()
{ {
case "${rc_cgroup_mode:-hybrid}" in case "${rc_cgroup_mode:-hybrid}" in
@@ -203,3 +184,22 @@ cgroup2_set_limits()
IFS="$OIFS" IFS="$OIFS"
return 0 return 0
} }
cgroup_cleanup()
{
cgroup_running || return 0
ebegin "starting cgroups cleanup"
for sig in TERM QUIT INT; do
cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
for i in 0 1; do
kill -s $sig $pids
for j in 0 1 2; do
cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
sleep 1
done
done 2>/dev/null
done
cgroup_get_pids || { eend 0 "finished" ; return 0; }
kill -9 $pids
eend $(cgroup_running && echo 1 || echo 0) "fail to stop all processes"
}