瀏覽代碼

Fixed the 404 errors for silex-raw (updated the URLs). Compiled files for php-silex and php-phpixie.

Michael Robertson 12 年之前
父節點
當前提交
3c8dbdf464

+ 2 - 2
php-phpixie/assets/config/db.php

@@ -7,10 +7,10 @@ return array(
 		'driver' => 'mysql',
 		
 		//'Connection' is required if you use the PDO driver
-		'connection'=>'mysql:host=localhost;dbname=hello_world',
+		'connection'=>'mysql:host=172.16.98.120;dbname=hello_world',
 		
 		// 'db' and 'host' are required if you use Mysqli driver
 		'db' => 'hello_world',
-		'host'=>'localhost'
+		'host'=>'172.16.98.120'
 	)
 );

+ 1 - 1
php-phpixie/deploy/nginx.conf

@@ -61,7 +61,7 @@ http {
         #    proxy_pass   http://127.0.0.1;
         #}
 
-        root /home/fb/FrameworkBenchmarks/php-phpixie/web/;
+        root /home/mrobertson/FrameworkBenchmarks/php-phpixie/web/;
         index  index.php;
 
         location / {

+ 2 - 2
php-phpixie/deploy/php-phpixie

@@ -1,6 +1,6 @@
 <VirtualHost *:8080>
-  Alias /php-phpixie/ "/home/fb/FrameworkBenchmarks/php-phpixie/web/"
-  <Directory /home/fb/FrameworkBenchmarks/php-phpixie/web/>
+  Alias /php-phpixie/ "/home/mrobertson/FrameworkBenchmarks/php-phpixie/web/"
+  <Directory /home/mrobertson/FrameworkBenchmarks/php-phpixie/web/>
           Options Indexes FollowSymLinks MultiViews
           #AllowOverride None
           Order allow,deny

+ 1 - 1
php-phpixie/vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit947ea4decfc38807f5034e43cfc30239::getLoader();
+return ComposerAutoloaderInit7523313caafb4ecdc50586cfe9125af8::getLoader();

+ 3 - 3
php-phpixie/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit947ea4decfc38807f5034e43cfc30239
+class ComposerAutoloaderInit7523313caafb4ecdc50586cfe9125af8
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit947ea4decfc38807f5034e43cfc30239
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit947ea4decfc38807f5034e43cfc30239', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit7523313caafb4ecdc50586cfe9125af8', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit947ea4decfc38807f5034e43cfc30239', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit7523313caafb4ecdc50586cfe9125af8', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);
         $baseDir = dirname($vendorDir);

+ 3 - 3
php-silex/benchmark_config

@@ -25,8 +25,8 @@
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
-      "fortune_url": "/fortune",
-      "update_url": "/update?queries=",
+      "fortune_url": "/fortunes",
+      "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
@@ -44,4 +44,4 @@
       "versus": "php"
     }
   }]
-}
+}

+ 1 - 1
php-silex/deploy/nginx_raw.conf

@@ -61,7 +61,7 @@ http {
         #    proxy_pass   http://127.0.0.1;
         #}
 
-        root /home/ubuntu/FrameworkBenchmarks/php-silex/web/;
+        root /home/mrobertson/FrameworkBenchmarks/php-silex/web/;
         index  index_raw.php;
 
         location / {

+ 2 - 2
php-silex/deploy/php-silex

@@ -1,6 +1,6 @@
 <VirtualHost *:8080>
-  Alias /php-silex/ "/home/ubuntu/FrameworkBenchmarks/php-silex/web/"
-  <Directory /home/ubuntu/FrameworkBenchmarks/php-silex/web/>
+  Alias /php-silex/ "/home/mrobertson/FrameworkBenchmarks/php-silex/web/"
+  <Directory /home/mrobertson/FrameworkBenchmarks/php-silex/web/>
           Options Indexes FollowSymLinks MultiViews
           #AllowOverride None
           Order allow,deny

+ 1 - 1
php-silex/vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit40ccb447439961a904c4289232cf33d7::getLoader();
+return ComposerAutoloaderInitb4cec0b4c1141a885915e746a70b627f::getLoader();

+ 3 - 3
php-silex/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit40ccb447439961a904c4289232cf33d7
+class ComposerAutoloaderInitb4cec0b4c1141a885915e746a70b627f
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit40ccb447439961a904c4289232cf33d7
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit40ccb447439961a904c4289232cf33d7', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitb4cec0b4c1141a885915e746a70b627f', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit40ccb447439961a904c4289232cf33d7', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitb4cec0b4c1141a885915e746a70b627f', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);
         $baseDir = dirname($vendorDir);

+ 4 - 4
php-silex/web/index_raw.php

@@ -19,7 +19,7 @@ $app->get('/json', function() {
 
 // Test 2: Single database query
 $app->get('/db', function() {
-    $db = new mysqli('192.168.100.102', 'benchmarkdbuser', 'benchmarkdbpass', 'hello_world');
+    $db = new mysqli('172.16.98.120', 'benchmarkdbuser', 'benchmarkdbpass', 'hello_world');
     $row = mysqli_query($db, 'SELECT id, randomNumber FROM World WHERE id = '.rand(1, 10000));
 
     return new Response(json_encode(mysqli_fetch_assoc($row)), 200, array('Content-Type' => 'application/json'));
@@ -28,7 +28,7 @@ $app->get('/db', function() {
 // Test 3: Multiple database queries
 $app->get('/queries', function(Request $request) {
     $queries = max(1, min($request->query->get('queries'), 500));
-    $db = new mysqli('192.168.100.102', 'benchmarkdbuser', 'benchmarkdbpass', 'hello_world');
+    $db = new mysqli('172.16.98.120', 'benchmarkdbuser', 'benchmarkdbpass', 'hello_world');
 
     for ($i=0; $i<$queries; $i++) {
         $rows[] = mysqli_fetch_assoc(mysqli_query($db, 'SELECT id, randomNumber FROM World WHERE id = '.rand(1, 10000)));
@@ -39,7 +39,7 @@ $app->get('/queries', function(Request $request) {
 
 // Test 4: Fortunes
 $app->get('/fortunes', function() {
-    $db = new mysqli('192.168.100.102', 'benchmarkdbuser', 'benchmarkdbpass', 'hello_world');
+    $db = new mysqli('172.16.98.120', 'benchmarkdbuser', 'benchmarkdbpass', 'hello_world');
     $result = mysqli_query($db, 'SELECT * FROM Fortune');
     while ($row = mysqli_fetch_row($result)) {
         $fortunes[$row[0]] = htmlspecialchars($row[1], ENT_IGNORE);
@@ -58,7 +58,7 @@ $app->get('/fortunes', function() {
 // Test 5: Database updates
 $app->get('/updates', function(Request $request) {
     $queries = max(1, min($request->query->get('queries'), 500));
-    $db = new mysqli('192.168.100.102', 'benchmarkdbuser', 'benchmarkdbpass', 'hello_world');
+    $db = new mysqli('172.16.98.120', 'benchmarkdbuser', 'benchmarkdbpass', 'hello_world');
     for ($i=0; $i<$queries; $i++) {
         $rows[] = mysqli_fetch_assoc(mysqli_query($db, 'SELECT id, randomNumber FROM World WHERE id = '.rand(1, 10000)));
     }