don't use 'fireslay' anymore; get pids list in ioslay-mgr.sh and pass them to ioslay-firefox to kill there

2 files changed, 29 insertions, 8 deletions

diff --git a/ioslay-firefox b/ioslay-firefox
index 40fbd7e..41aa6a4 100755
--- a/ioslay-firefox
+++ b/ioslay-firefox
@@ -40,7 +40,10 @@ iotop_reader()
                     if [ "$(sum $log)" -gt 4 ]
                     then
                         log= # this is year zero; all past history is erased.
-                        fireslay
+                        (
+                            set -x
+                            kill $pids
+                        )
                     fi
                 else
                     log=$(last 10 $log 0)
@@ -74,4 +77,11 @@ sudo_iotop()
     fi
 }
 
+if [ $# -le 0 ]
+then
+    exit
+fi
+
+pids=$*
+
 sudo_iotop -qq -b $(printf '\55\55pid=%s\n' "$@") | iotop_reader
diff --git a/ioslay-mgr.sh b/ioslay-mgr.sh
index 7d6461f..1241a68 100755
--- a/ioslay-mgr.sh
+++ b/ioslay-mgr.sh
@@ -5,6 +5,10 @@ then
     enable -f /usr/lib/bash/sleep sleep
 fi
 
+export NOTICE=y
+noticeLOG() { [ "$NOTICE" ] || return; echo "Notice: $*" >&2; }
+debugLOG() { [ "$DBG" ] || return; echo "Debug: $*" >&2; }
+
 . sliceweasel.lib.sh
 
 vkill()
@@ -38,7 +42,6 @@ GROUP_BASENAME=firefox
 
 group_procs=$(get_firefox_cgroup_procs)
 
-wantcomm='Web Content'
 ioslay=
 lastprocs=
 SIGNALLED=
@@ -62,10 +65,14 @@ do
             for pid in $procs
             do
                 read comm < /proc/$pid/comm
-                if [ "$comm" = "$wantcomm" ]
-                then
-                    set -- "$@" "$pid"
-                fi
+                case "$comm" in
+                    'Isolated Web Content' | 'Web Content' | 'Isolated Web Co')
+                        set -- "$@" "$pid"
+                        debugLOG "accept /proc/$pid/comm $comm"
+                        ;;
+                    *)
+                       debugLOG "reject /proc/$pid/comm $comm"
+                esac
             done
 
             # echo "pids: ($*|$(echo $procs))" >&2
@@ -73,8 +80,12 @@ do
             then
                 slay_slayer
                 wait $ioslay
-                ioslay-firefox "$@" &
-                ioslay=$!
+                if [ $# -gt 0 ]
+                then
+                    ioslay-firefox "$@" &
+                    ioslay=$!
+                    noticeLOG "Launched ioslay-firefox[$ioslay] $*"
+                fi
             fi
             lastargs=$*
         fi