Ability to check results stack by stack

motin · motin · commit a9887153d75b · 2015-12-09T17:43:50.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 /nbproject/
-/output/
 vendor/
diff --git a/README.md b/README.md
@@ -204,6 +204,16 @@ stack=docker_nginx_hhvm_3_10_1 sh benchmark.sh
 stack=docker_nginx_php_7_0_0 sh benchmark.sh
 ~~~
 
+### Check the results
+
+To see the results graph, run the following script from outside the docker shell, from the repository root:
+
+~~~
+bin/docker-urls.sh
+~~~
+
+It echoes URLs, which you should open up in your browser.
+
 ## References
 
 * [Aura](http://auraphp.com/) ([@auraphp](https://twitter.com/auraphp))
diff --git a/bin/docker-urls.sh b/bin/docker-urls.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+DIR=`dirname $0`;
+
+echo "PHP 5.6.4 Stack:";
+echo "http://"$(docker-machine ip default)":"$(docker-compose -f $DIR/../docker/docker-compose.yml port nginx_php_5_6_4 80 | sed 's/[0-9.]*://')
+echo "HHVM 3.10.1 Stack:";
+echo "http://"$(docker-machine ip default)":"$(docker-compose -f $DIR/../docker/docker-compose.yml port nginx_hhvm_3_10_1 80 | sed 's/[0-9.]*://')
+echo "PHP 7.0.0 Stack:";
+echo "http://"$(docker-machine ip default)":"$(docker-compose -f $DIR/../docker/docker-compose.yml port nginx_php_7_0_0 80 | sed 's/[0-9.]*://')
+
+exit 0
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -18,6 +18,8 @@ php_5_6_4:
     - ./stack/php/:/stack/php:rw
   ports:
     - "9000"
+  environment:
+    STACK: 'docker_nginx_php_5_6_4'
   working_dir: '/repo'
   command: "/stack/php/run-php-fpm.sh"
 
@@ -29,6 +31,8 @@ hhvm_3_10_1:
     - ./stack/php/:/stack/php:rw
   ports:
     - "9000"
+  environment:
+    STACK: 'docker_nginx_hhvm_3_10_1'
   working_dir: '/repo'
   command: "/stack/php/run-hhvm.sh"
 
@@ -40,6 +44,8 @@ php_7_0_0:
     - ./stack/php/:/stack/php:rw
   ports:
     - "9000"
+  environment:
+    STACK: 'docker_nginx_php_7_0_0'
   working_dir: '/repo'
   command: "/stack/php/run-php-fpm-7.sh"
 
diff --git a/index.php b/index.php
@@ -1,8 +1,20 @@
 <?php
 
+$stack = getenv('STACK') ? getenv('STACK') : 'local';
+$host = null;
+switch ($stack) {
+    case 'local':
+        $host = 'localhost';
+        break;
+    default:
+        $host = str_replace('docker_', '', $stack);
+        break;
+};
+$output_dir = __DIR__ . '/output/' . $stack;
+
 Parse_Results: {
     require __DIR__ . '/libs/parse_results.php';
-    $results = parse_results(__DIR__ . '/output/results.hello_world.log');
+    $results = parse_results($output_dir . '/results.hello_world.log');
 }
 
 Load_Theme: {
@@ -50,6 +62,7 @@
 <body>
 <h1>PHP Framework Benchmark</h1>
 <h2>Hello World Benchmark</h2>
+<h3><?php echo $stack; ?></h3>
 <div>
 <?php
 echo $div_rpm, $div_mem, $div_time, $div_file;
@@ -58,11 +71,11 @@
 
 <ul>
 <?php
-$url_file = __DIR__ . '/output/urls.log';
+$url_file = $output_dir . '/urls.log';
 if (file_exists($url_file)) {
     $urls = file($url_file);
     foreach ($urls as $url) {
-        $url = str_replace('127.0.0.1', $_SERVER['HTTP_HOST'], $url);
+        $url = str_replace(['127.0.0.1', $host], $_SERVER['HTTP_HOST'], $url);
         echo '<li><a href="' . htmlspecialchars($url, ENT_QUOTES, 'UTF-8') .
              '">' . htmlspecialchars($url, ENT_QUOTES, 'UTF-8') .
              '</a></li>' . "\n";
diff --git a/output/docker_nginx_php_5_6_4/.gitignore b/output/docker_nginx_php_5_6_4/.gitignore
@@ -0,0 +1,3 @@
+*
+!results.hello_world.log
+!.gitignore
diff --git a/output/docker_nginx_php_5_6_4/results.hello_world.log b/output/docker_nginx_php_5_6_4/results.hello_world.log
@@ -0,0 +1,23 @@
+phalcon-2.0: 774.64:   282936: 0.001357: 5
+ice-1.0: 680.57:   275560: 0.002463: 4
+tipsy-0.10: 762.23:   336568: 0.000640: 18
+fatfree-3.5: 365.25:   443728: 0.002854: 9
+slim-2.6: 761.72:   499712: 0.000745: 24
+ci-3.0: 97.54:   451096: 0.029233: 26
+nofuss-1.2: 343.89:   619496: 0.010555: 6
+slim-3.0: 502.51:   647744: 0.001052: 56
+bear-1.0: 202.53:   791424: 0.008215: 98
+lumen-5.1: 303.53:   750624: 0.005721: 32
+ze-1.0: 216.34:   822864: 0.011665: 64
+radar-1.0-dev: 253.12:   738608: 0.008413: 73
+yii-2.0: 304.98:  1399392: 0.004463: 49
+silex-1.3: 319.21:   733952: 0.003194: 58
+cygnite-1.3: 71.28:   779760: 0.026458: 70
+fuel-1.8-dev: 38.59:   729960: 0.116497: 55
+phpixie-3.2: 32.26:  1329368: 0.005880: 164
+aura-2.0: 110.17:   932784: 0.017762: 68
+cake-3.1: 92.69:  1383696: 0.016896: 84
+symfony-2.7: 15.94:  2735352: 0.014343: 103
+laravel-5.1: 79.35:  2637888: 0.054929: 38
+zf-2.5: 2.08:  3069536: 0.049335: 209
+typo3f-3.0: 0.32:  6553744: 2.795679: 272
diff --git a/output/results.hello_world.log b/output/results.hello_world.log

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`/nbproject/`
`2`		`-/output/`
`3`	`2`	`vendor/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+*`
	`2`	`+!results.hello_world.log`
	`3`	`+!.gitignore`