sliceweasel will use v2 cgroup within the user.slice/firefox cgroup

2 files changed, 84 insertions, 28 deletions

diff --git a/ioslay-mgr.sh b/ioslay-mgr.sh
index d4f545c..d7ce1cb 100755
--- a/ioslay-mgr.sh
+++ b/ioslay-mgr.sh
@@ -1,16 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 ioslay=
 each_new_process()
 {
     while read pid _
     do
-        set -- "$@" $pid
+        read -N 10001000 procs < /sys/fs/cgroup/$group/cgroup.procs
+        set -- $procs
 
-        # filter non-existent processes
-        for _ in "$@"
+        for pid in "$@"
         do
-            if [ -e /proc/"$1" ]
+            if read comm < /proc/$pid/comm && [ "$comm" = 'Web Content' ]
             then
                 set -- "$@" "$1"
             fi
@@ -19,7 +19,11 @@ each_new_process()
 
         if [ "$ioslay" ]
         then
-            kill $(pgrep -P $ioslay)
+            children=$(pgrep -P $ioslay)
+            if [ "$children" ]
+            then
+                kill $children
+            fi
             wait $ioslay
         fi
 
@@ -45,7 +49,41 @@ get_uid()
     )
 }
 
-# group=firefox~$(get_uid)
-group=firefox~1000
+#cgroup-show-each-new-process "$group" | grep --line-buffered 'Web Content' | each_new_process
+
+# Really, could just check for any/first cgroup with processes and basename
+# 'firefox'.  Fork for each one.
+
+uid=1000
+group=user.slice/user-$uid.slice/firefox
+wantcomm='Web Content'
+ioslay=
+lastprocs=
+while true
+do
+    read -N 1000100 procs < /sys/fs/cgroup/$group/cgroup.procs
+    if [ "$procs" ]
+    then
+        set --
+        for pid in $procs
+        do
+            read comm < /proc/$pid/comm
+            if [ "$comm" = "$wantcomm" ]
+            then
+                set -- "$@" "$pid"
+            fi
+        done
+
+        echo "pids: ($*|$(echo $procs))" >&2
+        if [ "$lastargs" != "$*" ]
+        then
+            [ -z "$ioslay" ] || kill $ioslay $(pgrep -P $ioslay)
+            wait $ioslay
+            ioslay-firefox "$@" &
+            ioslay=$!
+        fi
+        lastargs=$*
+    fi
+    sleep 1
+done
 
-cgroup-show-each-new-process "$group" | grep --line-buffered 'Web Content' | each_new_process
diff --git a/sliceweasel b/sliceweasel
index 2460d0f..1b34d67 100755
--- a/sliceweasel
+++ b/sliceweasel
@@ -65,30 +65,44 @@ get_total_io()
     echo ${total%.*}
 }
 
+root_write()
+{
+    $AS_ROOT sh -c 'cat > "$1"' sh "$1"
+}
+
 join_group()
 {
-    GROUP_DIR=/sys/fs/cgroup/firefox~$id
-    [ -d "$GROUP_DIR" ] || sudo mkdir "$GROUP_DIR"
-    echo $$ | sudo tee "$GROUP_DIR"/cgroup.procs
+    GROUP_DIR=/sys/fs/cgroup/"$1"
+    [ -d "$GROUP_DIR" ] || $AS_ROOT mkdir "$GROUP_DIR"
+    echo $$ | root_write "$GROUP_DIR"/cgroup.procs
 }
 
 add_subtree_controller()
 {
-    search="\\b$1\\b"
-    grep -q "$search" /sys/fs/cgroup/cgroup.controllers || return
-    grep "$search" /sys/fs/cgroup/cgroup.subtree_control || echo +"$1" | $AS_ROOT tee /sys/fs/cgroup/cgroup.subtree_control
+    local group="$1" controller="$2" control_file
+    control_file=$(realpath -e "/sys/fs/cgroup/$group/cgroup.subtree_control") || return
+    case "$control_file" in
+        /sys/fs/cgroup/cgroup.subtree_control) ;;
+        *) add_subtree_controller "$group"/.. "$2" ;;
+    esac
+
+    [ "$1" ] && [ "$2" ] && [ -e "$control_file" ] || return
+    if ! grep -q "\\b${controller}\\b" "$control_file"
+    then
+        echo +"$controller" | root_write "$control_file"
+    fi
 }
 
 set_max()
 {
-    add_subtree_controller "$1"
-    [ -e "$GROUP_DIR"/"$1".max ] || return
-    printf '%s\n' "$2" | $AS_ROOT tee "$GROUP_DIR"/"$1".max
+    add_subtree_controller "$1"/.. "$2"
+    [ -e "$GROUP_DIR"/"$2".max ] || return
+    printf '%s\n' "$3" | root_write "$GROUP_DIR"/"$2".max
 }
 
 set_max_ratio()
 {
-    local controller="$1" ratio="$2" limit
+    local group="$1" controller="$2" ratio="$3" limit
     total=$(get_total_$controller)
     n=${ratio%%/*}
     d=${ratio#$n/}
@@ -104,22 +118,26 @@ set_max_ratio()
                 *:*) ;;
                 *) return 1 ;;
             esac
-            set_max "$controller" "$majmin wbps=$limit rbps=$limit"
+            set_max "$group" "$controller" "$majmin wbps=$limit rbps=$limit"
         ;;
-        *) set_max "$controller" "$limit"
+        *) set_max "$group" "$controller" "$limit"
     esac
 }
 
-set -ex
-
-[ "$(id -un)" = 0 ] && AS_ROOT= || AS_ROOT='sudo --'
+get_current_group()
+{
+    read g < /proc/$$/cgroup
+    echo ${g#0::/}
+}
 
-id=$(id -u)
+set -e
 
-join_group firefox~"$id"
-set_max_ratio memory 1/2
-set_max_ratio io 9/10
+[ "$(id -un)" = 0 ] && AS_ROOT= || AS_ROOT='sudo --'
 
+group=user.slice/user-$(id -u).slice/firefox
+join_group "$group"
+set_max_ratio "$group" memory 1/2
+set_max_ratio "$group" io 9/10
 exec firefox "$@"