factor out functions into lib file; fixes

6 files changed, 138 insertions, 134 deletions

diff --git a/Makefile b/Makefile
index 77a6412..85cca10 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 BINDIR = /usr/local/bin
-BINARIES = sliceweasel fireslay ioslay-firefox cgroup-show-each-new-process ioslay-mgr.sh
+BINARIES = sliceweasel sliceweasel.lib.sh sliceuser fireslay ioslay-firefox cgroup-show-each-new-process ioslay-mgr.sh
 SUDO != [ "$$(id -u)" = 0 ] || echo sudo
 
 .PHONY: install install-bin
diff --git a/ioslay-firefox b/ioslay-firefox
index 96b3280..bebcd11 100755
--- a/ioslay-firefox
+++ b/ioslay-firefox
@@ -130,7 +130,7 @@ iotop_reader()
                     log=$(last 10 $log 0)
                 fi
                 case "$log" in
-                    *1* | * )
+                    *1* )
                         (
                             set -x
                             : $log
diff --git a/ioslay-mgr.sh b/ioslay-mgr.sh
index d7ce1cb..6765d83 100755
--- a/ioslay-mgr.sh
+++ b/ioslay-mgr.sh
@@ -74,7 +74,7 @@ do
             fi
         done
 
-        echo "pids: ($*|$(echo $procs))" >&2
+        # echo "pids: ($*|$(echo $procs))" >&2
         if [ "$lastargs" != "$*" ]
         then
             [ -z "$ioslay" ] || kill $ioslay $(pgrep -P $ioslay)
diff --git a/sliceuser b/sliceuser
new file mode 100755
index 0000000..9d80789
--- /dev/null
+++ b/sliceuser
@@ -0,0 +1,12 @@
+#!/bin/sh
+. sliceweasel.lib.sh
+
+set -e
+IO_ROOT_DIR=$HOME/.cache/mozilla/firefox/
+[ -d "$IO_ROOT_DIR" ]
+[ "$(id -un)" = 0 ] && AS_ROOT= || AS_ROOT='sudo --'
+
+group=$(get_current_group)
+set_max_ratio "$group" memory 3/4
+set_max_ratio "$group" io 8/10
+
diff --git a/sliceweasel b/sliceweasel
index 1b34d67..ebca97f 100755
--- a/sliceweasel
+++ b/sliceweasel
@@ -1,137 +1,9 @@
 #!/bin/sh
-
-# HAHAHAH Bro it finally works. It fucking works. It finally fucking works.
-
-# It just needs to monitor IO with iotop and start killing firefox processes
-# from the bottom (least memory usage) up. This allows any one tab access to the
-# full memory available to Firefox! And integrate it into the your-fired.sh
-# script. And it's truly fixed. And integrate the firefox updater.
-
-IO_ROOT_DIR=$HOME/.cache/mozilla/firefox/
-
-[ -d "$IO_ROOT_DIR" ] || exit
-
-get_age()
-{
-    local mtime now
-    mtime=$(stat --format=%Y "$1") || return
-    now=$(date +%s) || return
-    echo $(( now - mtime ))
-}
-
-get_filesystem()
-{
-    echo /
-}
-
-get_total_memory()
-{
-    free -b | {
-        read _
-        read _ total _
-        echo $total
-    }
-}
-
-math()
-{
-    printf '%s\n' "$*" | bc -lq
-}
-
-get_total_io()
-{
-    results=$IO_ROOT_DIR/io.test.result
-    zeroes=$IO_ROOT_DIR/io.test
-    if [ -e "$results" ]
-    then
-        age=$(get_age "$results") || return
-        if [ "$age" -gt $((60 * 60 * 24 * 7)) ]
-        then
-            rm "$results"
-        fi
-    fi
-
-    if ! [ -e "$results" ]
-    then
-        MEGS=128
-        then=$(date +%s.%N) || return
-        dd if=/dev/zero of="$zeroes" bs=${MEGS}M count=1 || return
-        now=$(date +%s.%N) || return
-        rm "$zeroes"
-        speed=$(math $now - $then / $((MEGS * 1024 * 1024))) || return
-        echo $speed > "$results"
-    fi
-    read total < "$results" || return
-    echo ${total%.*}
-}
-
-root_write()
-{
-    $AS_ROOT sh -c 'cat > "$1"' sh "$1"
-}
-
-join_group()
-{
-    GROUP_DIR=/sys/fs/cgroup/"$1"
-    [ -d "$GROUP_DIR" ] || $AS_ROOT mkdir "$GROUP_DIR"
-    echo $$ | root_write "$GROUP_DIR"/cgroup.procs
-}
-
-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" ;;
-    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"/.. "$2"
-    [ -e "$GROUP_DIR"/"$2".max ] || return
-    printf '%s\n' "$3" | root_write "$GROUP_DIR"/"$2".max
-}
-
-set_max_ratio()
-{
-    local group="$1" controller="$2" ratio="$3" limit
-    total=$(get_total_$controller)
-    n=${ratio%%/*}
-    d=${ratio#$n/}
-    [ "$d" = "${d%/*}" ] || return
-    limit=$(( total * n / d ))
-    [ "$limit" ] || return
-    [ "$limit" -gt 0 ] || return
-    case "$controller" in
-        io)
-            fsroot=$(get_filesystem "$IO_ROOT_DIR") || return
-            majmin=$(lsblk -o 'MOUNTPOINT,MAJ:MIN' | sed -ne "s?^$fsroot  *??p") || return
-            case "$majmin" in
-                *:*) ;;
-                *) return 1 ;;
-            esac
-            set_max "$group" "$controller" "$majmin wbps=$limit rbps=$limit"
-        ;;
-        *) set_max "$group" "$controller" "$limit"
-    esac
-}
-
-get_current_group()
-{
-    read g < /proc/$$/cgroup
-    echo ${g#0::/}
-}
+. sliceweasel.lib.sh
 
 set -e
-
+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
diff --git a/sliceweasel.lib.sh b/sliceweasel.lib.sh
new file mode 100755
index 0000000..24221e2
--- /dev/null
+++ b/sliceweasel.lib.sh
@@ -0,0 +1,120 @@
+#!/bin/sh
+get_age()
+{
+    local mtime now
+    mtime=$(stat --format=%Y "$1") || return
+    now=$(date +%s) || return
+    echo $(( now - mtime ))
+}
+
+get_filesystem()
+{
+    echo /
+}
+
+get_total_memory()
+{
+    free -b | {
+        read _
+        read _ total _
+        echo $total
+    }
+}
+
+math()
+{
+    printf '%s\n' "$*" | bc -lq
+}
+
+get_total_io()
+{
+    results=$IO_ROOT_DIR/io.test.result
+    zeroes=$IO_ROOT_DIR/io.test
+    if [ -e "$results" ]
+    then
+        age=$(get_age "$results") || return
+        if [ "$age" -gt $((60 * 60 * 24 * 7)) ]
+        then
+            rm "$results"
+        fi
+    fi
+
+    if ! [ -e "$results" ]
+    then
+        MEGS=128
+        then=$(date +%s.%N) || return
+        dd if=/dev/zero of="$zeroes" bs=${MEGS}M count=1 || return
+        now=$(date +%s.%N) || return
+        rm "$zeroes"
+        speed=$(math $now - $then / $((MEGS * 1024 * 1024))) || return
+        echo $speed > "$results"
+    fi
+    read total < "$results" || return
+    echo ${total%.*}
+}
+
+root_write()
+{
+    $AS_ROOT sh -c 'cat > "$1"' sh "$1"
+}
+
+join_group()
+{
+    GROUP_DIR=/sys/fs/cgroup/"$1"
+    [ -d "$GROUP_DIR" ] || $AS_ROOT mkdir "$GROUP_DIR"
+    echo $$ | root_write "$GROUP_DIR"/cgroup.procs
+}
+
+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" ;;
+    esac
+
+    [ "$1" ] && [ "$2" ] && [ -e "$control_file" ] || return
+    if ! grep -qe "\\b${controller}\\b" "$control_file"
+    then
+        echo +"$controller" | root_write "$control_file"
+    fi
+}
+
+set_max()
+{
+    add_subtree_controller "$1"/.. "$2"
+    max_file=/sys/fs/cgroup/$group/$2.max
+    [ -e "$max_file" ] || return
+    printf '%s\n' "$3" | root_write "$max_file"
+}
+
+set_max_ratio()
+{
+    local group="$1" controller="$2" ratio="$3" limit
+    total=$(get_total_$controller)
+    n=${ratio%%/*}
+    d=${ratio#$n/}
+    [ "$d" = "${d%/*}" ] || return
+    limit=$(( total * n / d ))
+    [ "$limit" ] || return
+    [ "$limit" -gt 0 ] || return
+    case "$controller" in
+        io)
+            fsroot=$(get_filesystem "$IO_ROOT_DIR") || return
+            majmin=$(lsblk -o 'MOUNTPOINT,MAJ:MIN' | sed -ne "s?^$fsroot  *??p") || return
+            case "$majmin" in
+                *:*) ;;
+                *) return 1 ;;
+            esac
+            set_max "$group" "$controller" "$majmin wbps=$limit rbps=$limit"
+        ;;
+        *) set_max "$group" "$controller" "$limit"
+    esac
+}
+
+get_current_group()
+{
+    read g < /proc/$$/cgroup
+    echo ${g#0::/}
+}