v20111201-2

eryx · Dec 6, 2011 · 7575d1a · 7575d1a
1 parent a599342
commit 7575d1a
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 36 deletions.
diff --git a/bench.php b/bench.php
@@ -18,10 +18,6 @@
     'micromvc4' => 'MicroMVC 4.0.0',
     'yaf' => 'Yaf 2.1.3-beta',
 );
-$al = array(
-    'micromvc4' => 'MicroMVC 4.0.0',
-    'yaf' => 'Yaf 2.1.3-beta',
-);
 $a = array_keys($al);
 
 //
@@ -33,11 +29,10 @@
     foreach ($a as $v) {
 
         shell_exec("/etc/init.d/apache2 restart");        
-        /*do {
+        do {
             sleep(60);
             $loadavg = strstr(shell_exec('cat /proc/loadavg'), ' ', true);
         } while ($loadavg > 0.05);
-        */
 
         echo "Testing $v\n";
         /** Memuse/Time/fun-calls/fun-map **/

diff --git a/deps/phpgraphlib.php b/deps/phpgraphlib.php
@@ -417,7 +417,7 @@ function generateBars() {
 							$textHorizPos = round($xStart + ($this->bar_width / 2) - ((strlen($key) * $this->text_width) / 2));
 							$textHorizPos = round($xStart + ($this->bar_width / 2) - 20);
 							//imagestring($this->image, 2, $textHorizPos, $textVertPos, $key,  $this->x_axis_text_color);
-							imagettftext($this->image, 10, -30, $textHorizPos, $textVertPos + 10, $this->x_axis_text_color, './deps/DejaVuSansCondensed.ttf', $key);
+							imagettftext($this->image, 10, -20, $textHorizPos, $textVertPos + 10, $this->x_axis_text_color, './deps/DejaVuSansCondensed.ttf', $key);
 						}
 					}
 				}
@@ -988,11 +988,11 @@ function setDataValues($bool) {
 	function setDataCurrency($currency_type = 'dollar') {
 		switch (strtolower($currency_type)) {
 			case 'dollar': $this->data_currency = '$'; break;
-			case 'yen': $this->data_currency = '¥'; break;
-			case 'pound': $this->data_currency = '£'; break;
-			case 'lira': $this->data_currency = '£'; break;
+			case 'yen': $this->data_currency = '?'; break;
+			case 'pound': $this->data_currency = '?'; break;
+			case 'lira': $this->data_currency = '?'; break;
 			/* Euro doesn't display properly...
-			case 'euro': $this->data_currency = ''; break; */
+			case 'euro': $this->data_currency = '?'; break; */
 			/* Franc doesn't display properly
 			case 'franc': $this->data_currency = '?'; break; */
 			default: $this->data_currency = $currency_type; break;
@@ -1062,7 +1062,7 @@ function formatDataAsPercent($input) {
 		return $input . '%';
 	}
 	function formatDataAsDegrees($input) {
-		return $input . '°';
+		return $input . '?';
 	}
 	function formatDataAsGeneric($input) {
 		return $input . $this->data_format_generic;

diff --git a/result-20111201/ab-c100-n30000.png b/result-20111201/ab-c100-n30000.png
diff --git a/result-20111201/ab-c100-n30000.txt b/result-20111201/ab-c100-n30000.txt
@@ -1,12 +1,11 @@
    framework QPS, LOAD, MEM(KB), TIME(ms); functions, include files
-   micromvc4     6203, 0.06, 176.73,  2.19;    6229, 3.29, 176.73,  2.23;    6312,17.69, 176.73,  2.21;    6248, 7.01, 176.73,  2.21;    123,   12
-     laravel     3072, 1.65, 518.56,  4.42;    3085, 2.99, 518.56,  4.49;    3067, 1.36, 518.56,  4.46;    3075, 2.00, 518.56,  4.46;    238,   26
-         yii     2347, 3.16,1180.27,  6.58;    2335, 0.79,1180.27,  6.59;    2321, 4.09,1180.27,  6.62;    2334, 2.68,1180.27,  6.60;    269,   19
-          ci     2337, 3.49, 750.85,  7.23;    2330, 1.55, 750.85,  7.18;    2330, 3.31, 750.85,  7.21;    2332, 2.78, 750.85,  7.21;    489,   22
-     cakephp      882, 1.51,2824.46, 15.81;     876,14.91,2824.46, 16.40;     877,20.42,2824.46, 16.32;     878,12.28,2824.46, 16.18;    834,   37
-         yaf     7235, 0.72,  67.93,  1.30;    7274,19.68,  67.93,  1.26;    7269, 5.25,  67.93,  1.27;    7259, 8.55,  67.93,  1.28;     18,    4
-          zf      686,13.52,2560.02, 18.74;     679,10.69,2560.02, 20.20;     682, 4.35,2560.02, 22.80;     682, 9.52,2560.02, 20.58;   1783,   60
-        slim     2295, 3.29, 699.74,  7.18;    2269, 2.20, 699.74,  7.26;    2299, 2.34, 699.74,  7.13;    2288, 2.61, 699.74,  7.19;    521,   14
-         zf2      320,76.02,4056.48, 31.97;     320,81.32,4056.48, 32.58;     319,79.13,4056.48, 32.39;     320,78.82,4056.48, 32.31;   5660,  125
-    symfony2      174,94.14,5453.13, 47.82;     173,95.31,5456.60, 45.51;     173,90.83,5456.60, 45.08;     173,93.43,5455.44, 46.14;   7671,  142
-
+    symfony2      423,48.07,3885.21, 21.22;     423,67.65,3885.21, 26.71;     424,55.88,3885.21, 22.69;     423,57.20,3885.21, 23.54;   2524,   89
+          zf      675, 7.16,2576.83, 17.94;     674, 3.13,2576.83, 19.37;     671, 2.60,2576.83, 23.14;     673, 4.30,2576.83, 20.15;   1789,   61
+         zf2      322,80.88,4011.38, 31.55;     323,78.99,4011.38, 30.59;     323,80.18,4011.38, 33.08;     323,80.02,4011.38, 31.74;   5620,  124
+     cakephp      874, 2.30,2824.51, 16.16;     874, 2.60,2824.51, 16.34;     871, 7.68,2824.51, 16.24;     873, 4.19,2824.51, 16.25;    834,   37
+          ci     2322, 0.50, 752.64,  7.26;    2333, 0.57, 752.64,  7.35;    2305, 3.10, 752.64,  7.27;    2320, 1.39, 752.64,  7.29;    491,   22
+         yii     2345, 1.63,1180.28,  6.72;    2342, 1.63,1180.28,  6.67;    2302, 1.72,1180.28,  6.67;    2330, 1.66,1180.28,  6.69;    269,   19
+        slim     2307, 2.11, 699.78,  7.29;    2313, 1.95, 699.78,  7.24;    2265, 1.95, 699.78,  7.26;    2295, 2.00, 699.78,  7.26;    521,   14
+     laravel     3055, 0.98, 518.69,  4.61;    3076, 0.90, 518.69,  4.43;    3095, 0.54, 518.69,  4.49;    3075, 0.81, 518.69,  4.51;    238,   26
+   micromvc4     6301, 0.35, 176.74,  2.22;    6344, 0.42, 176.74,  2.26;    6264, 0.09, 176.74,  2.23;    6303, 0.29, 176.74,  2.24;    123,   12
+         yaf     7231, 0.03,  67.95,  1.27;    7216, 0.04,  67.95,  1.26;    7367, 0.34,  67.95,  1.24;    7271, 0.14,  67.95,  1.26;     18,    4
diff --git a/result-20111201/ab-c200-n50000.png b/result-20111201/ab-c200-n50000.png
diff --git a/result-20111201/ab-c200-n50000.txt b/result-20111201/ab-c200-n50000.txt
@@ -1,12 +1,11 @@
    framework QPS, LOAD, MEM(KB), TIME(ms); functions, include files
-          ci     2251, 0.69,   0.00,  0.00;    2124,13.59,   0.00,  0.00;    2239,20.75,   0.00,  0.00;    2204,11.68,   0.00,  0.00;      0,    0
-          zf      682, 7.93,   0.00,  0.00;     676, 6.48,   0.00,  0.00;     673, 9.63,   0.00,  0.00;     677, 8.01,   0.00,  0.00;      0,    0
-         yaf     4782, 6.27,   0.00,  0.00;    5939,29.04,   0.00,  0.00;    4377,51.34,   0.00,  0.00;    5033,28.88,   0.00,  0.00;      0,    0
-    symfony2      170,122.66,   0.00,  0.00;     166,127.88,   0.00,  0.00;     162,137.71,   0.00,  0.00;     166,129.42,   0.00,  0.00;      0,    0
-        slim     2169,71.26,   0.00,  0.00;    2126,11.98,   0.00,  0.00;    2169,77.60,   0.00,  0.00;    2155,53.61,   0.00,  0.00;      0,    0
-         yii     2263,40.40,   0.00,  0.00;    2280, 3.28,   0.00,  0.00;    2266,77.71,   0.00,  0.00;    2270,40.46,   0.00,  0.00;      0,    0
-     cakephp      863,14.85,   0.00,  0.00;     864, 4.56,   0.00,  0.00;     863,25.83,   0.00,  0.00;     864,15.08,   0.00,  0.00;      0,    0
-         zf2      312,125.30,   0.00,  0.00;     313,40.35,   0.00,  0.00;     311,123.34,   0.00,  0.00;     312,96.33,   0.00,  0.00;      0,    0
-     laravel     2822,76.76,   0.00,  0.00;    2842, 4.17,   0.00,  0.00;    2976,16.67,   0.00,  0.00;    2880,32.53,   0.00,  0.00;      0,    0
-   micromvc4     5764,55.34,   0.00,  0.00;    4549,21.17,   0.00,  0.00;    2928,34.31,   0.00,  0.00;    4414,36.94,   0.00,  0.00;      0,    0
-
+    symfony2      417,18.46,3885.21, 26.46;     419,17.26,3885.21, 25.52;     419,15.23,3885.21, 18.76;     419,16.98,3885.21, 23.58;   2524,   89
+          zf      666, 8.23,2576.83, 18.93;     668, 1.48,2576.83, 18.55;     664, 5.24,2576.83, 23.75;     666, 4.98,2576.83, 20.41;   1789,   61
+         zf2      324,111.00,4011.38, 33.01;     323,122.07,4011.38, 30.30;     324,135.72,4011.38, 31.24;     323,122.93,4011.38, 31.52;   5620,  124
+     cakephp      855, 0.87,2824.51, 16.05;     866, 3.85,2824.51, 16.21;     852, 0.71,2824.51, 16.16;     857, 1.81,2824.51, 16.14;    834,   37
+          ci     2158, 3.75, 752.64,  7.28;    2183, 0.12, 752.64,  7.38;    2163, 0.61, 752.64,  7.36;    2168, 1.49, 752.64,  7.34;    491,   22
+         yii     2273, 0.90,1180.28,  6.63;    2268, 3.44,1180.28,  6.78;    2253, 1.88,1180.28,  6.72;    2264, 2.07,1180.28,  6.71;    269,   19
+        slim     2104, 2.79, 699.78,  7.19;    2157, 2.83, 699.78,  7.27;    2155, 1.89, 699.78,  7.23;    2139, 2.50, 699.78,  7.23;    521,   14
+     laravel     2996, 1.66, 518.69,  4.47;    2890, 1.22, 518.69,  4.46;    2986, 3.77, 518.69,  4.44;    2957, 2.22, 518.69,  4.46;    238,   26
+   micromvc4     5504, 0.24, 176.74,  2.23;    5835, 0.41, 176.74,  2.24;    5434, 0.81, 176.74,  2.24;    5591, 0.49, 176.74,  2.24;    123,   12
+         yaf     6307, 0.01,  67.95,  1.25;    6421, 0.27,  67.95,  1.27;    6563, 0.18,  67.95,  1.29;    6430, 0.15,  67.95,  1.27;     18,    4
diff --git a/result-20111201/loadavg.png b/result-20111201/loadavg.png
diff --git a/result-20111201/memory-usage.png b/result-20111201/memory-usage.png
diff --git a/result-20111201/number-of-files.png b/result-20111201/number-of-files.png
diff --git a/result-20111201/number-of-function-calls.png b/result-20111201/number-of-function-calls.png
diff --git a/result-20111201/response-time.png b/result-20111201/response-time.png
diff --git a/result-20111201/symfony2/funmap0.png b/result-20111201/symfony2/funmap0.png
diff --git a/symfony2/.gitignore b/symfony2/.gitignore