make ioslay work as service with ioslay-mgr

4 files changed, 141 insertions, 39 deletions

diff --git a/Makefile b/Makefile
index 498afa8..77a6412 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 BINDIR = /usr/local/bin
-BINARIES = sliceweasel fireslay ioslay-firefox
+BINARIES = sliceweasel fireslay ioslay-firefox cgroup-show-each-new-process ioslay-mgr.sh
 SUDO != [ "$$(id -u)" = 0 ] || echo sudo
 
 .PHONY: install install-bin
diff --git a/cgroup-show-each-new-process b/cgroup-show-each-new-process
new file mode 100755
index 0000000..d1473f1
--- /dev/null
+++ b/cgroup-show-each-new-process
@@ -0,0 +1,51 @@
+#!/bin/bash
+cgroup=${1:-firefox~$(id -u)}
+
+show_new_pids()
+{
+    if [ -e "$procs" ]
+    then
+        sort < "$procs" > pids
+        if [ -e old-pids ]
+        then
+            comm -13 old-pids pids
+        else
+            cat pids
+        fi
+        mv pids old-pids
+    fi
+}
+
+show_pid_comm()
+{
+    local pid comm
+    pid=$1
+    if 2>/dev/null read comm < /proc/$pid/comm
+    then
+        echo "$pid $comm"
+    else
+        echo $pid '(disappeared)' >&2
+    fi
+}
+
+each_line()
+{
+    local line
+    while read line
+    do "$@" "$line"
+    done
+}
+
+RUNTIME_DIR=$(mktemp -d) || exit
+trap 'cd /; rm -rf "$RUNTIME_DIR"' EXIT
+cd "$RUNTIME_DIR"
+
+enable -f /usr/lib/bash/sleep sleep
+procs=/sys/fs/cgroup/$cgroup/cgroup.procs
+
+while true
+do
+    show_new_pids
+    sleep 1
+done | each_line show_pid_comm
+
diff --git a/ioslay-firefox b/ioslay-firefox
index 21ea81b..96b3280 100755
--- a/ioslay-firefox
+++ b/ioslay-firefox
@@ -1,40 +1,4 @@
 #!/bin/bash
-if [ "$UID" != 0 ]
-then
-    sudo -- "$0" "$@"
-    exit
-fi
-
-while [ $# -gt 0 ]
-do
-    case "$1" in
-        -q | --quiet )
-            exec 2>/dev/null
-            shift
-            ;;
-        -a | --all )
-            IOSLAY_KILL_ALL=y
-            shift
-            ;;
-        -- )
-            shift
-            break
-            ;;
-        -* )
-            exit 1
-            ;;
-        * )
-            break
-            ;;
-    esac
-done
-
-if [ $# -gt 0 ]
-then
-    echo "$0: Error: usage" >&2
-    exit 1
-fi
-
 web_content_pids()
 {
     top -w512 -b -o '%MEM' | {
@@ -166,7 +130,7 @@ iotop_reader()
                     log=$(last 10 $log 0)
                 fi
                 case "$log" in
-                    *1* )
+                    *1* | * )
                         (
                             set -x
                             : $log
@@ -184,4 +148,40 @@ iotop_reader()
     done
 }
 
-relaunch_iotop
+if [ "$UID" != 0 ]
+then
+    sudo -- "$0" "$@"
+    exit
+fi
+
+while [ $# -gt 0 ]
+do
+    case "$1" in
+        -q | --quiet )
+            exec 2>/dev/null
+            shift
+            ;;
+        -a | --all )
+            IOSLAY_KILL_ALL=y
+            shift
+            ;;
+        -- )
+            shift
+            break
+            ;;
+        -* )
+            exit 1
+            ;;
+        * )
+            break
+            ;;
+    esac
+done
+
+# if [ $# -gt 0 ]
+# then
+#     echo "$0: Error: usage" >&2
+#     exit 1
+# fi
+
+iotop -qq -b $(printf '\55\55pid=%s\n' "$@") | iotop_reader
diff --git a/ioslay-mgr.sh b/ioslay-mgr.sh
new file mode 100755
index 0000000..d4f545c
--- /dev/null
+++ b/ioslay-mgr.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+ioslay=
+each_new_process()
+{
+    while read pid _
+    do
+        set -- "$@" $pid
+
+        # filter non-existent processes
+        for _ in "$@"
+        do
+            if [ -e /proc/"$1" ]
+            then
+                set -- "$@" "$1"
+            fi
+            shift
+        done
+
+        if [ "$ioslay" ]
+        then
+            kill $(pgrep -P $ioslay)
+            wait $ioslay
+        fi
+
+        if [ $# -gt 0 ]
+        then
+            ioslay-firefox "$@" &
+            ioslay=$!
+        fi
+    done
+}
+
+get_uid()
+{
+    (
+        if [ "$SUDO_USER" ]
+        then
+            IFS=:
+            set -- $(getent passwd "${SUDO_USER}") || return
+            echo $3
+        else
+            id -un
+        fi
+    )
+}
+
+# group=firefox~$(get_uid)
+group=firefox~1000
+
+cgroup-show-each-new-process "$group" | grep --line-buffered 'Web Content' | each_new_process