this all works i think

4 files changed, 27 insertions, 19 deletions

diff --git a/fireslay b/fireslay
index 1926e19..a63a709 100755
--- a/fireslay
+++ b/fireslay
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -e
+. sliceweasel.lib.sh
 
 die()
 {
@@ -54,7 +56,7 @@ main()
                 ;;
         esac
         set -x
-        ps $* >&2
+        ps $* >&2 &
         kill $*
     )
 
@@ -65,14 +67,14 @@ main()
 
 web_content_pids()
 {
-    top -w512 -bn1 -o '%MEM' | sed -e '1,/^$/d' | {
-        while read line
-        do set -- $line
-           [ "${12} ${13}" = "Web Content" ] || continue
-           [ "${8}" != Z ] || continue
-           echo $1
-        done
-    }
+    while read pids
+    do
+      for pid in $pids
+      do
+          read comm < /proc/$pid/comm && [ "$comm" = 'Web Content' ] || continue
+          read _ _ state _ < /proc/$pid/stat && [ "$state" != Z ] && echo $pid
+      done
+    done < "$(get_current_group)"/cgroup.procs
 }
 
 main "$@"
diff --git a/sliceuser b/sliceuser
index 9d80789..16d441f 100755
--- a/sliceuser
+++ b/sliceuser
@@ -7,6 +7,7 @@ IO_ROOT_DIR=$HOME/.cache/mozilla/firefox/
 [ "$(id -un)" = 0 ] && AS_ROOT= || AS_ROOT='sudo --'
 
 group=$(get_current_group)
+set -x
 set_max_ratio "$group" memory 3/4
 set_max_ratio "$group" io 8/10
 
diff --git a/sliceweasel b/sliceweasel
index ebca97f..7a0cae2 100755
--- a/sliceweasel
+++ b/sliceweasel
@@ -6,7 +6,7 @@ IO_ROOT_DIR=$HOME/.cache/mozilla/firefox/
 [ -d "$IO_ROOT_DIR" ]
 [ "$(id -un)" = 0 ] && AS_ROOT= || AS_ROOT='sudo --'
 
-group=user.slice/user-$(id -u).slice/firefox
+group=/sys/fs/cgroup/user.slice/user-$(id -u).slice/firefox
 join_group "$group"
 set_max_ratio "$group" memory 1/2
 set_max_ratio "$group" io 9/10
diff --git a/sliceweasel.lib.sh b/sliceweasel.lib.sh
index bbaed78..3c54841 100755
--- a/sliceweasel.lib.sh
+++ b/sliceweasel.lib.sh
@@ -55,12 +55,12 @@ get_total_io()
 
 root_write()
 {
-    $AS_ROOT sh -c 'cat > "$1"' sh "$1"
+    $AS_ROOT sh -c 'cat > "$1"' sh "$1" || true
 }
 
 join_group()
 {
-    GROUP_DIR=/sys/fs/cgroup/"$1"
+    GROUP_DIR="$1"
     [ -d "$GROUP_DIR" ] || $AS_ROOT mkdir "$GROUP_DIR"
     echo $$ | root_write "$GROUP_DIR"/cgroup.procs
 }
@@ -68,13 +68,15 @@ join_group()
 add_subtree_controller()
 {
     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" ;;
+    control_file="$group/cgroup.subtree_control"
+
+    [ "$group" ] && [ "$controller" ] && [ -d "$group" ] && [ -e "$control_file" ] || return
+
+    case "$group" in
+        /sys/fs/cgroup) ;;
+        *) add_subtree_controller "$(realpath "$group/..")" "$2" ;;
     esac
 
-    [ "$1" ] && [ "$2" ] && [ -e "$control_file" ] || return
     if ! grep -qe "\\b${controller}\\b" "$control_file"
     then
         echo +"$controller" | root_write "$control_file"
@@ -83,9 +85,12 @@ add_subtree_controller()
 
 set_max()
 {
-    add_subtree_controller "$1"/.. "$2"
     max_file=$group/$2.max
-    [ -e "$max_file" ] || return
+    if [ ! -e "$max_file" ]
+    then
+        add_subtree_controller "$1"/.. "$2"
+        [ -e "$max_file" ] || return
+    fi
     printf '%s\n' "$3" | root_write "$max_file"
 }