Using headers to output benchmark data (solved Content-Length curl issues as described in #38)

Author: motin

benchmarks/_functions.sh

@@ -4,15 +4,16 @@ benchmark ()
     url="$2"
     ab_log="$output_dir/$fw.ab.log"
     output="$output_dir/$fw.output"
+    benchmark_data="$output_dir/$fw.benchmark_data"
 
     echo "ab -c 10 -t 3 $url"
     ab -c 10 -t 3 "$url" > "$ab_log"
-    curl "$url" > "$output"
+    curl -H 'X-Include-Benchmark-Output-Data: 1'  --dump-header "$benchmark_data" "$url" > "$output"
 
     rps=`grep "Requests per second:" "$ab_log" | cut -f 7 -d " "`
-    memory=`tail -1 "$output" | cut -f 1 -d ':'`
-    time=`tail -1 "$output" | cut -f 2 -d ':'`
-    file=`tail -1 "$output" | cut -f 3 -d ':'`
+    memory=`grep "X-Benchmark-Output-Data:" "$benchmark_data" | cut -f 2 -d ':' | cut -f 2 -d ' '`
+    time=`grep "X-Benchmark-Output-Data:" "$benchmark_data" | cut -f 3 -d ':'`
+    file=`grep "X-Benchmark-Output-Data:" "$benchmark_data" | cut -f 4 -d ':'`
     echo "$fw: $rps: $memory: $time: $file" >> "$results_file"
 
     echo "$fw" >> "$check_file"
@@ -35,9 +36,16 @@ benchmark ()
         tmp=`cat "$output"`
         error="$error$tmp"
     fi
-    x=`grep ':' "$output" || true`
-    if [ "$x" = "" ]; then
-        tmp=`cat "$output"`
+    if [ "$memory" = "" ]; then
+        tmp=`cat "$benchmark_data"`
+        error="$error$tmp"
+    fi
+    if [ "$time" = "" ]; then
+        tmp=`cat "$benchmark_data"`
+        error="$error$tmp"
+    fi
+    if [ "$file" = "" ]; then
+        tmp=`cat "$benchmark_data"`
         error="$error$tmp"
     fi
     if [ "$error" != "" ]; then

libs/output_data.php

@@ -1,13 +1,22 @@
 <?php
+// Only output data if specifically requested
+$headers = getallheaders();
+if (!isset($headers["X-Include-Benchmark-Output-Data"])) {
+    return;
+}
 
+// Get benchmark output data
 $real_usage = null;
-// On HHVM, using $real_usage = false ends up always returning 2097152 bytes - https://github.com/facebook/hhvm/issues/2257
 if (defined('HHVM_VERSION')) {
+    // On HHVM, using $real_usage = false ends up always returning 2097152 bytes - https://github.com/facebook/hhvm/issues/2257
     $real_usage = true;
 }
-return sprintf(
-    "\n%' 8d:%f:%d",
+$results = sprintf(
+    "%' 8d:%f:%d",
     memory_get_peak_usage($real_usage), // Using $real_usage due to
     microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'],
     count(get_included_files()) - 1
 );
+
+// Respond benchmark output data in header
+header('X-Benchmark-Output-Data: ' . $results);