From 3d91c104f37a65c69e0cfbbb3adf1d2cdc7a23cf Mon Sep 17 00:00:00 2001
From: Sean McBride <spmcbride1201@gmail.com>
Date: Tue, 20 Oct 2020 14:52:22 -0400
Subject: [PATCH] chore: Update preemption with new keys

---
 runtime/experiments/preemption/debug.sh  | 22 ++++----
 runtime/experiments/preemption/run.sh    | 67 +++++-------------------
 runtime/experiments/preemption/spec.json | 12 +++--
 3 files changed, 34 insertions(+), 67 deletions(-)

diff --git a/runtime/experiments/preemption/debug.sh b/runtime/experiments/preemption/debug.sh
index f3dfe65..62c64e3 100755
--- a/runtime/experiments/preemption/debug.sh
+++ b/runtime/experiments/preemption/debug.sh
@@ -4,16 +4,16 @@
 # This allows debugging outside of the Docker container
 # Also disables pagination and stopping on SIGUSR1
 
-declare project_path="$(
-  cd "$(dirname "$1")/../.."
-  pwd
-)"
-echo $project_path
-cd ../../bin
-export LD_LIBRARY_PATH="$(pwd):$LD_LIBRARY_PATH"
+experiment_directory=$(pwd)
+project_directory=$(cd ../.. && pwd)
+binary_directory=$(cd "$project_directory"/bin && pwd)
+
+export LD_LIBRARY_PATH="$binary_directory:$LD_LIBRARY_PATH"
+export PATH="$binary_directory:$PATH"
+
 gdb --eval-command="handle SIGUSR1 nostop" \
+  --eval-command="handle SIGPIPE nostop" \
   --eval-command="set pagination off" \
-  --eval-command="set substitute-path /sledge/runtime $project_path" \
-  --eval-command="run ../tests/mixed_preemption/test_mixed_preemption.json" \
-  ./sledgert
-cd ../../tests
+  --eval-command="set substitute-path /sledge/runtime $project_directory" \
+  --eval-command="run $experiment_directory/spec.json" \
+  sledgert
diff --git a/runtime/experiments/preemption/run.sh b/runtime/experiments/preemption/run.sh
index 92f62c2..2a4de74 100755
--- a/runtime/experiments/preemption/run.sh
+++ b/runtime/experiments/preemption/run.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+source ../common.sh
 
 # This experiment is intended to document how the level of concurrent requests influence the latency, throughput, and success/failure rate
 # Use -d flag if running under gdb
@@ -14,41 +15,11 @@ for scheduler in ${schedulers[*]}; do
   log=log.txt
 
   mkdir -p "$results_directory"
-
-  {
-    echo "*******"
-    echo "* Git *"
-    echo "*******"
-    git log | head -n 1 | cut -d' ' -f2
-    git status
-    echo ""
-
-    echo "************"
-    echo "* Makefile *"
-    echo "************"
-    cat ../../Makefile
-    echo ""
-
-    echo "**********"
-    echo "* Run.sh *"
-    echo "**********"
-    cat run.sh
-    echo ""
-
-    echo "************"
-    echo "* Hardware *"
-    echo "************"
-    lscpu
-    echo ""
-
-    echo "*************"
-    echo "* Execution *"
-    echo "*************"
-  } >>"$results_directory/$log"
+  log_environment >>"$results_directory/$log"
 
   # Start the runtime
   if [ "$1" != "-d" ]; then
-    SLEDGE_SCHEDULER=$scheduler PATH="$binary_directory:$PATH" LD_LIBRARY_PATH="$binary_directory:$LD_LIBRARY_PATH" sledgert "$experiment_directory/spec.json" >>"$results_directory/$log" 2>>"$results_directory/$log" &
+    SLEDGE_NWORKERS=5 SLEDGE_SCHEDULER=$scheduler PATH="$binary_directory:$PATH" LD_LIBRARY_PATH="$binary_directory:$LD_LIBRARY_PATH" sledgert "$experiment_directory/spec.json" >>"$results_directory/$log" 2>>"$results_directory/$log" &
     sleep 1
   else
     echo "Running under gdb"
@@ -62,32 +33,26 @@ for scheduler in ${schedulers[*]}; do
   # Execute workloads long enough for runtime to learn excepted execution time
   echo -n "Running Samples: "
   for input in ${inputs[*]}; do
-    hey -z ${duration_sec}s -c 3 -q 1000 -o csv -m GET -d "$input\n" http://localhost:$((10000 + input))
+    hey -z ${duration_sec}s -c 3 -o csv -m GET -d "$input\n" http://localhost:$((10000 + input))
   done
   echo "[DONE]"
   sleep 5
 
   echo "Running Experiments"
   # Run each separately
-  hey -z ${duration_sec}s -cpus 3 -c 3 -q 1000 -o csv -m GET -d "40\n" http://localhost:10040 >"$results_directory/fib40.csv"
-  hey -z ${duration_sec}s -cpus 3 -c 3 -q 1000 -o csv -m GET -d "10\n" http://localhost:10010 >"$results_directory/fib10.csv"
+  hey -z ${duration_sec}s -cpus 3 -c 3 -o csv -m GET -d "40\n" http://localhost:10040 >"$results_directory/fib40.csv"
+  hey -z ${duration_sec}s -cpus 3 -c 3 -o csv -m GET -d "10\n" http://localhost:10010 >"$results_directory/fib10.csv"
 
   # Run lower priority first, then higher priority. The lower priority has offsets to ensure it runs the entire time the high priority is trying to run
-  hey -z $((duration_sec + 2 * offset))s -cpus 2 -c 3 -q 1000 -o csv -m GET -d "40\n" http://localhost:10040 >"$results_directory/fib40-con.csv" &
+  hey -z $((duration_sec + 2 * offset))s -cpus 3 -c 3 -o csv -m GET -d "40\n" http://localhost:10040 >"$results_directory/fib40-con.csv" &
   sleep $offset
-  hey -z ${duration_sec}s -cpus 3 -c 3 -q 1000 -o csv -m GET -d "10\n" http://localhost:10010 >"$results_directory/fib10-con.csv" &
-  sleep $((duration_sec + offset))
+  hey -z ${duration_sec}s -cpus 3 -c 3 -o csv -m GET -d "10\n" http://localhost:10010 >"$results_directory/fib10-con.csv" &
+  sleep $((duration_sec + offset + 5))
 
-  # Stop the runtime
-  if [ "$1" != "-d" ]; then
-    sleep $offset
-    echo -n "Running Cleanup: "
-    pkill sledgert >/dev/null 2>/dev/null
-    pkill wrk >/dev/null 2>/dev/null
-    echo "[DONE]"
-  fi
+  # Stop the runtime if not in debug mode
+  [ "$1" != "-d" ] && kill_runtime
 
-  # # Generate *.csv and *.dat results
+  # Generate *.csv and *.dat results
   echo -n "Parsing Results: "
 
   printf "Payload,Success_Rate\n" >>"$results_directory/success.csv"
@@ -151,12 +116,8 @@ for scheduler in ${schedulers[*]}; do
     tr ',' ' ' <"$results_directory/$file.csv" | column -t >>"$results_directory/$file.dat"
   done
 
-  # Generate gnuplots
-  cd "$results_directory" || exit
-  gnuplot ../../latency.gnuplot
-  gnuplot ../../success.gnuplot
-  gnuplot ../../throughput.gnuplot
-  cd "$experiment_directory" || exit
+  # Generate gnuplots. Commented out because we don't have *.gnuplots defined
+  # generate_gnuplots
 
   # Cleanup, if requires
   echo "[DONE]"
diff --git a/runtime/experiments/preemption/spec.json b/runtime/experiments/preemption/spec.json
index a802a18..1a5067c 100644
--- a/runtime/experiments/preemption/spec.json
+++ b/runtime/experiments/preemption/spec.json
@@ -3,7 +3,8 @@
   "name": "fibonacci_10",
   "path": "fibonacci_wasm.so",
   "port": 10010,
-  "relative-deadline-us": 1500,
+  "expected-execution-us": 600,
+  "relative-deadline-us": 2000,
   "argsize": 1,
   "http-req-headers": [],
   "http-req-content-type": "text/plain",
@@ -17,6 +18,7 @@
   "name": "fibonacci_20",
   "path": "fibonacci_wasm.so",
   "port": 10020,
+  "expected-execution-us": 900,
   "relative-deadline-us": 5000,
   "argsize": 1,
   "http-req-headers": [],
@@ -31,6 +33,7 @@
   "name": "fibonacci_25",
   "path": "fibonacci_wasm.so",
   "port": 10025,
+  "expected-execution-us": 90000,
   "relative-deadline-us": 200000,
   "argsize": 1,
   "http-req-headers": [],
@@ -45,7 +48,8 @@
   "name": "fibonacci_30",
   "path": "fibonacci_wasm.so",
   "port": 10030,
-  "relative-deadline-us": 8000,
+  "expected-execution-us": 9000,
+  "relative-deadline-us": 80000,
   "argsize": 1,
   "http-req-headers": [],
   "http-req-content-type": "text/plain",
@@ -59,6 +63,7 @@
   "name": "fibonacci_35",
   "path": "fibonacci_wasm.so",
   "port": 10035,
+  "expected-execution-us": 9000,
   "relative-deadline-us": 53000,
   "argsize": 1,
   "http-req-headers": [],
@@ -73,7 +78,8 @@
   "name": "fibonacci_40",
   "path": "fibonacci_wasm.so",
   "port": 10040,
-  "relative-deadline-us": 660000,
+  "expected-execution-us": 550000,
+  "relative-deadline-us": 1000000,
   "argsize": 1,
   "http-req-headers": [],
   "http-req-content-type": "text/plain",