cleanup; uid detection works

4 files changed, 36 insertions, 93 deletions

diff --git a/fireslay b/fireslay
index 9485cd4..ef1e4f4 100755
--- a/fireslay
+++ b/fireslay
@@ -83,7 +83,7 @@ web_content_pids()
     done < $FIREFOX_GROUP_PROCS
 }
 
-uid=$(getent passwd $SUDO_USER | (IFS=: read _ _ id _; echo $id))
+uid=$(get_uid)
 group=user.slice/user-$uid.slice/firefox
 group_procs=/sys/fs/cgroup/$group/cgroup.procs
 
diff --git a/ioslay-firefox b/ioslay-firefox
index fb382e0..5041260 100755
--- a/ioslay-firefox
+++ b/ioslay-firefox
@@ -69,40 +69,14 @@ iotop_reader()
     done
 }
 
-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
+sudo_iotop()
+{
+    if [ "$UID" = 0 ]
+    then
+        command iotop "$@"
+    else
+        sudo iotop "$@"
+    fi
+}
 
-iotop -qq -b $(printf '\55\55pid=%s\n' "$@") | iotop_reader
+sudo_iotop -qq -b $(printf '\55\55pid=%s\n' "$@") | iotop_reader
diff --git a/ioslay-mgr.sh b/ioslay-mgr.sh
index 85ff4d7..423aa5e 100755
--- a/ioslay-mgr.sh
+++ b/ioslay-mgr.sh
@@ -1,58 +1,6 @@
 #!/bin/bash
 
-ioslay=
-each_new_process()
-{
-    while read pid _
-    do
-        read -N 10001000 procs < /sys/fs/cgroup/$group/cgroup.procs
-        set -- $procs
-
-        for pid in "$@"
-        do
-            if read comm < /proc/$pid/comm && [ "$comm" = 'Web Content' ]
-            then
-                set -- "$@" "$1"
-            fi
-            shift
-        done
-
-        if [ "$ioslay" ]
-        then
-            children=$(pgrep -P $ioslay)
-            if [ "$children" ]
-            then
-                kill $children
-            fi
-            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
-    )
-}
-
-#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.
+. sliceweasel.lib.sh
 
 vkill()
 {
@@ -61,9 +9,13 @@ vkill()
         return
     fi
     (
+        if [ "$(id -u)" = 0 ]
+        then sudo=
+        else sudo=sudo
+        fi
         set -x
         ps u "$@"
-        sudo kill "$@"
+        $sudo kill "$@"
     )
 }
 
@@ -77,8 +29,11 @@ slay_slayer()
     fi
 }
 
+GROUP_BASENAME=firefox
+
+uid=$(set -x; get_uid)
 uid=1000
-group=user.slice/user-$uid.slice/firefox
+group=user.slice/user-$uid.slice/$GROUP_BASENAME
 group_procs=/sys/fs/cgroup/$group/cgroup.procs
 wantcomm='Web Content'
 ioslay=
@@ -105,7 +60,7 @@ do
         then
             slay_slayer
             wait $ioslay
-            sudo ioslay-firefox "$@" &
+            ioslay-firefox "$@" &
             ioslay=$!
         fi
         lastargs=$*
diff --git a/sliceweasel.lib.sh b/sliceweasel.lib.sh
index 890fb79..28091a0 100755
--- a/sliceweasel.lib.sh
+++ b/sliceweasel.lib.sh
@@ -120,6 +120,20 @@ set_max_ratio()
     esac
 }
 
+get_uid()
+{
+    (
+        if [ "$SUDO_USER" ]
+        then
+            IFS=:
+            set -- $(getent passwd "${SUDO_USER}") || return
+            echo $3
+        else
+            id -u
+        fi
+    )
+}
+
 get_current_group()
 {
     read g < /proc/$$/cgroup