Storing results separately for each stack

Author: motin

benchmark.sh

@@ -1,6 +1,11 @@
 #!/bin/sh
 
-base="http://127.0.0.1/php-framework-benchmark"
+# exit on failure
+set -e
+
+if [ "$stack" = "" ]; then
+  stack="local"
+fi
 
 cd `dirname $0`
 
@@ -14,6 +19,6 @@ fi
 
 cd benchmarks
 
-sh hello_world.sh "$base"
+sh hello_world.sh "$stack"
 
 php ../bin/show_results_table.php

benchmarks/_functions.sh

@@ -2,8 +2,8 @@ benchmark ()
 {
     fw="$1"
     url="$2"
-    ab_log="output/$fw.ab.log"
-    output="output/$fw.output"
+    ab_log="$output_dir/$fw.ab.log"
+    output="$output_dir/$fw.output"
 
     echo "ab -c 10 -t 3 $url"
     ab -c 10 -t 3 "$url" > "$ab_log"

benchmarks/hello_world.sh

@@ -1,22 +1,42 @@
 #!/bin/sh
 
+# exit on failure
+set -e
+
 cd `dirname $0`
 . ./_functions.sh
 
-base="$1"
+stack="$1"
 bm_name=`basename $0 .sh`
 
-results_file="output/results.$bm_name.log"
-check_file="output/check.$bm_name.log"
-error_file="output/error.$bm_name.log"
-url_file="output/urls.log"
+if [ "$stack" = "local" ]; then
+  base="http://127.0.0.1/php-framework-benchmark"
+fi
+if [ "$stack" = "docker_nginx_php_5_6_4" ]; then
+  base="http://nginx_php_5_6_4"
+fi
+if [ "$stack" = "docker_nginx_hhvm_3_10_1" ]; then
+  base="http://nginx_hhvm_3_10_1"
+fi
+if [ "$stack" = "docker_nginx_php_7_0_0" ]; then
+  base="http://nginx_php_7_0_0"
+fi
+
+output_dir="output/$stack"
+
+results_file="$output_dir/results.$bm_name.log"
+check_file="$output_dir/check.$bm_name.log"
+error_file="$output_dir/error.$bm_name.log"
+url_file="$output_dir/urls.log"
 
 cd ..
 
-mv "$results_file" "$results_file.old"
-mv "$check_file" "$check_file.old"
-mv "$error_file" "$error_file.old"
-mv "$url_file" "$url_file.old"
+mkdir -p "$output_dir"
+
+mv "$results_file" "$results_file.old" || true
+mv "$check_file" "$check_file.old" || true
+mv "$error_file" "$error_file.old" || true
+mv "$url_file" "$url_file.old" || true
 
 for fw in `echo $targets`
 do

bin/show_results_table.php

@@ -3,7 +3,7 @@
 require __DIR__ . '/../libs/parse_results.php';
 require __DIR__ . '/../libs/build_table.php';
 
-$results = parse_results(__DIR__ . '/../output/results.hello_world.log');
+$results = parse_results(__DIR__ . '/../output/' . getenv('stack') . '/results.hello_world.log');
 //var_dump($results);
 
 echo build_table($results);