rename ioslay-mgr.sh; test write ops

4 files changed, 28 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index d259fd1..bcc1005 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 BINDIR = /usr/local/bin
-BINARIES = firestart firestartx $(addprefix src/,sliceweasel.lib.sh ioslay-mgr.sh ioslay-firefox)
+BINARIES = firestart firestartx $(addprefix src/,sliceweasel.lib.sh firefox-io-slayer ioslay-firefox)
 SUDO != [ "$$(id -u)" = 0 ] || echo sudo
 
 .PHONY: install install-bin
diff --git a/README.txt b/README.txt
index 492e278..c217f7a 100644
--- a/README.txt
+++ b/README.txt
@@ -14,7 +14,7 @@ Then you can use the two commands:
   firestartx - start Firefox in a CGroup and X server sandbox  (recommended)
 
 Within the `firefox` systemd service, a background service called `ioslay` will
-be started by `ioslay-mgr.sh`.
+be started by `firefox-io-slayer`.
 
 The launching of Firefox through either of these commands launches a watchdog
 process that kills Firefox processes when they are spinning the disk.
diff --git a/firestart b/firestart
index 5f388b5..f9f3bf0 100755
--- a/firestart
+++ b/firestart
@@ -1,20 +1,41 @@
-#!/bin/sh
+#!/bin/bash
 
 die() { printf "%s: Error: %s\n" "$0" "$*" >&2; exit 1; }
 
+# Test DEVICE WRITE OPS BY WRITEOPS
+test_write_ops()
+{
+    if ! [ -e "$1" ]
+    then
+        mkdir -p "$(dirname "$1")"
+        sync
+        begin=$(date +%s.%N)
+        dd if=/dev/urandom of="$DIR"/urandom.out bs=1M count=300
+        sync
+        end=$(date +%s.%N)
+        rm "$DIR"/urandom.out
+        bc -q > "$1" <<< "scale=5; seconds=$end - $begin; 300*1000*1000/seconds"
+    fi
+    cat "$1"
+}
+
 CMD=firefox
 UNIT=$CMD
 DIR=~/.mozilla
 MEMORY_MAX=50%
 READ_OPS=1G
 WRITE_OPS=$READ_OPS
-CONFDIR=$HOME/.config/firestart/conf
+CONFDIR=$HOME/.config/firestart
 
-if [ -e "$CONFDIR" ]
+if [ -e "$CONFDIR"/conf ]
 then
-    . "$CONFDIR"
+    . "$CONFDIR"/conf
 fi
 
+WRITE_OPS=$(test_write_ops "$CONFDIR"/diskspeed.dat)
+WRITE_OPS=${WRITE_OPS%.*}
+READ_OPS=$WRITE_OPS
+
 if systemctl --user is-active "$UNIT" >/dev/null
 then
     exec "$CMD" "$@" # Asks existing firefox to open a new window.
@@ -27,7 +48,7 @@ fi
 DEV=$(echo $(findmnt --target "$DIR" -o MAJ:MIN -n))
 [ "$DEV" ] || die "could not determine backing device for $DIR"
 
-ioslay-mgr.sh launch-unit
+firefox-io-slayer launch-unit
 
 systemctl --user reset-failed "$UNIT" 2>/dev/null
 systemd-run --user \
diff --git a/src/ioslay-mgr.sh b/src/firefox-io-slayer
index 56ab849..56ab849 100755
--- a/src/ioslay-mgr.sh
+++ b/src/firefox-io-slayer