Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-11-12 07:46:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

improvements to the new ps and slam implementations

Browse Source
This commit is contained in:
Jaromil 2017-12-11 13:29:54 +01:00
parent 8e33be0472
commit 121a64bc80
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tomb
View File

@ -2702,7 +2702,8 @@ list_processes() {
# $1 = (optional) name of tomb # $1 = (optional) name of tomb
# returns a list of process UIDs, one per line # returns a list of process UIDs, one per line
local mounted_tombs i local mounted_tombs i
local pnum puid pcmd powner local pnum puid pcmd powner found
found=0
mounted_tombs=(`list_tomb_mounts $1`) mounted_tombs=(`list_tomb_mounts $1`)
if [[ "${#mounted_tombs}" -gt 0 ]]; then if [[ "${#mounted_tombs}" -gt 0 ]]; then
if [[ "$1" = "" ]]; then if [[ "$1" = "" ]]; then
@ -2716,17 +2717,20 @@ list_processes() {
tombmount=${i[(ws:;:)2]} tombmount=${i[(ws:;:)2]}
tombname=${i[(ws:;:)5]} tombname=${i[(ws:;:)5]}
for pnum in ${(f)"$(_sudo lsof -t +D $tombmount)"}; do for pnum in ${(f)"$(_sudo lsof -t +D $tombmount)"}; do
found=$(($found + 1))
_verbose "process found: $pnum" _verbose "process found: $pnum"
puid=`cat /proc/${pnum}/loginuid` puid=`cat /proc/${pnum}/loginuid`
pcmd=`cat /proc/${pnum}/cmdline` pcmd=`cat /proc/${pnum}/cmdline`
if [[ "$puid" = "$UID" ]]; then powner=$(getent passwd $puid)
powner="owned" powner=${powner[(ws@:@)1]}
else powner=$puid; fi _verbose "process found: $pnum $pcmd ($powner)"
_message "::1 tombname:: ::2 cmd:: (::3 owner::) on ::4 tombmount::" \ _message "::1 tombname:: ::2 cmd:: (::3 owner::)" \
$tombname $pcmd $powner $tombmount $tombname $pcmd $powner
done done
done done
fi fi
_message "::1 foundproc:: running processes found inside ::2 numtombs:: open tombs" \
$found ${#mounted_tombs}
} }
# Kill all processes using the tomb # Kill all processes using the tomb
@ -2759,22 +2763,23 @@ slam_tomb() {
for pnum in ${(f)"$(_sudo lsof -t +D $tombmount)"}; do for pnum in ${(f)"$(_sudo lsof -t +D $tombmount)"}; do
puid=`cat /proc/${pnum}/loginuid` puid=`cat /proc/${pnum}/loginuid`
pcmd=`cat /proc/${pnum}/cmdline` pcmd=`cat /proc/${pnum}/cmdline`
_verbose "process found: $pnum $pcmd ($puid)" powner=$(getent passwd $puid)
if [[ "$puid" = "$UID" ]]; then powner=${powner[(ws@:@)1]}
powner="owned" _verbose "process found: $pnum $pcmd ($powner)"
else powner=$puid; fi
# iterate through 3 different signals to send, break on success # iterate through 3 different signals to send, break on success
for s in TERM HUP KILL; do for s in TERM HUP KILL; do
_message "::1 tombname:: sending ::2 sig:: to ::3 cmd:: (::4 uid::)" \ _message "::1 tombname:: sending ::2 sig:: to ::3 cmd:: (::4 uid::)" \
${tombname} ${s} ${pcmd} ${powner} ${tombname} ${s} ${pcmd} ${powner}
kill -$s $pnum _sudo kill -$s $pnum
# give some time to the process for a clean quit
sleep .5
# stop sending other signals if kill was succesfull # stop sending other signals if kill was succesfull
[[ -r /proc/$pnum ]] || break [[ -r /proc/$pnum ]] || break
done done
# if process still running then signal failure # if process still running then signal failure
[[ -r /proc/$pnum ]] && { [[ -r /proc/$pnum ]] && {
_warning "Can't kill ::1 puid:: ::2 pcmd:: (::3 powner::)" \ _warning "Can't kill ::1 process:: ::2 pcmd:: (::3 powner::)" \
$puid $pcmd $powner $pnum $pcmd $powner
result=1 } result=1 }
done done
# if it failed killing a process, report it # if it failed killing a process, report it