assume firestart cgroup layout

also:

  ioslay-mgr will warn once when ff is not running, but not
  spam logs with errors

4 files changed, 47 insertions, 35 deletions

diff --git a/fireslay b/fireslay
index ef1e4f4..892dbee 100755
--- a/fireslay
+++ b/fireslay
@@ -83,11 +83,7 @@ web_content_pids()
     done < $FIREFOX_GROUP_PROCS
 }
 
-uid=$(get_uid)
-group=user.slice/user-$uid.slice/firefox
-group_procs=/sys/fs/cgroup/$group/cgroup.procs
-
-FIREFOX_GROUP_PROCS=$group_procs
+FIREFOX_GROUP_PROCS=$(get_firefox_cgroup_procs)
 if [ -e "$FIREFOX_GROUP_PROCS" ]
 then
     main "$@"
diff --git a/firestart b/firestart
index 5be6d02..ce4aa54 100755
--- a/firestart
+++ b/firestart
@@ -18,13 +18,13 @@ DEV=$(echo $(findmnt --target "$DIR" -o MAJ:MIN -n))
 
 systemctl --user reset-failed "$UNIT" 2>/dev/null
 systemd-run --user \
-            --unit="$UNIT" \
-            --setenv=DISPLAY="$DISPLAY" \
-            --setenv=XAUTHORITY="$XAUTHORITY" \
-            --property=MemoryMax="$MEMORY_MAX" \
-            --property=IOReadIOPSMax="$DEV $READ_OPS" \
-            --property=IOWriteIOPSMax="$DEV $WRITE_OPS" \
-            --property=IOWriteIOPSMax="$DEV $WRITE_OPS" \
-            --property=Restart="on-failure" \
+            --unit "$UNIT" \
+            --setenv DISPLAY="$DISPLAY" \
+            --setenv XAUTHORITY="$XAUTHORITY" \
+            --property MemoryMax="$MEMORY_MAX" \
+            --property IOReadIOPSMax="$DEV $READ_OPS" \
+            --property IOWriteIOPSMax="$DEV $WRITE_OPS" \
+            --property IOWriteIOPSMax="$DEV $WRITE_OPS" \
+            --property Restart="on-failure" \
             -- \
             "$CMD" "$@"
diff --git a/ioslay-mgr.sh b/ioslay-mgr.sh
index 556fe74..7d6461f 100755
--- a/ioslay-mgr.sh
+++ b/ioslay-mgr.sh
@@ -36,10 +36,8 @@ slay_slayer()
 
 GROUP_BASENAME=firefox
 
-uid=$(set -x; get_uid)
-uid=1000
-group=user.slice/user-$uid.slice/$GROUP_BASENAME
-group_procs=/sys/fs/cgroup/$group/cgroup.procs
+group_procs=$(get_firefox_cgroup_procs)
+
 wantcomm='Web Content'
 ioslay=
 lastprocs=
@@ -47,28 +45,39 @@ SIGNALLED=
 trap 'SIGNALLED=y' SIGINT SIGTERM SIGHUP
 while [ ! "$SIGNALLED" ]
 do
-    read -N 1000100 procs < "$group_procs"
-    if [ "$procs" ]
+    if ! [ -e "$group_procs" ]
     then
-        set --
-        for pid in $procs
-        do
-            read comm < /proc/$pid/comm
-            if [ "$comm" = "$wantcomm" ]
+        [ "$warned" ] || echo "Warning: firefox not running or cgroup not found" >&2
+        warned=y
+    else
+        if [ "$warned" ]
+        then
+            echo "Found firefox cgroup: $group_procs" >&2
+            warned=
+        fi
+        read -N 1000100 procs < "$group_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
-                set -- "$@" "$pid"
+                slay_slayer
+                wait $ioslay
+                ioslay-firefox "$@" &
+                ioslay=$!
             fi
-        done
-
-        # echo "pids: ($*|$(echo $procs))" >&2
-        if [ "$lastargs" != "$*" ]
-        then
-            slay_slayer
-            wait $ioslay
-            ioslay-firefox "$@" &
-            ioslay=$!
+            lastargs=$*
         fi
-        lastargs=$*
     fi
     sleep 1
 done
diff --git a/sliceweasel.lib.sh b/sliceweasel.lib.sh
index 28091a0..d9a93c5 100755
--- a/sliceweasel.lib.sh
+++ b/sliceweasel.lib.sh
@@ -134,6 +134,13 @@ get_uid()
     )
 }
 
+get_firefox_cgroup_procs()
+{
+    uid=$(get_uid)
+    [ "$uid" ] || return
+    echo /sys/fs/cgroup/user.slice/user-$uid.slice/user@$uid.service/app.slice/firefox.service/cgroup.procs
+}
+
 get_current_group()
 {
     read g < /proc/$$/cgroup