Incorporate PR 664 via ptarjan:hhvm

hhvm/db.php

@@ -5,5 +5,9 @@
 
 require_once dirname(__FILE__).'/once.php.inc';
 
-$b = new Benchmark();
-$b->bench_db();
+function main() {
+    $b = new Benchmark();
+    $b->bench_db();
+}
+
+main();

hhvm/fortunes.php

@@ -5,5 +5,9 @@
 
 require_once dirname(__FILE__).'/once.php.inc';
 
-$b = new Benchmark();
-$b->bench_fortunes();
+function main() {
+    $b = new Benchmark();
+    $b->bench_fortunes();
+}
+
+main();

hhvm/json.php

@@ -3,5 +3,9 @@
 // 1. JSON Test
 require_once dirname(__FILE__).'/once.php.inc';
 
-$b = new Benchmark();
-$b->bench_json();
+function main() {
+    $b = new Benchmark();
+    $b->bench_json();
+}
+
+main();

hhvm/plaintext.php

@@ -3,5 +3,9 @@
 // 6. Plaintext Test
 require_once dirname(__FILE__).'/once.php.inc';
 
-$b = new Benchmark();
-$b->bench_plaintext();
+function main() {
+    $b = new Benchmark();
+    $b->bench_plaintext();
+}
+
+main();

hhvm/queries.php

@@ -5,14 +5,18 @@
 
 require_once dirname(__FILE__).'/once.php.inc';
 
-// Read number of queries to run from URL parameter
-$query_count = 1;
-if (!empty($_GET['queries'])) {
-  $query_count = intval($_GET['queries']);
-}
+function main() {
+    // Read number of queries to run from URL parameter
+    $query_count = 1;
+    if (!empty($_GET['queries'])) {
+      $query_count = intval($_GET['queries']);
+    }
+
+    // Fix the queries limits
+    $query_count = $query_count < 1 ? 1 : ($query_count > 500 ? 500 : $query_count);
 
-// Fix the queries limits
-$query_count = $query_count < 1 ? 1 : ($query_count > 500 ? 500 : $query_count);
+    $b = new Benchmark();
+    $b->bench_queries($query_count);
+}
 
-$b = new Benchmark();
-$b->bench_queries($query_count);
+main();

hhvm/updates.php

@@ -5,14 +5,18 @@
 
 require_once dirname(__FILE__).'/once.php.inc';
 
-// Read number of queries to run from URL parameter
-$query_count = 1;
-if (!empty($_GET['queries'])) {
-  $query_count = intval($_GET['queries']);
-}
+function main() {
+    // Read number of queries to run from URL parameter
+    $query_count = 1;
+    if (!empty($_GET['queries'])) {
+      $query_count = intval($_GET['queries']);
+    }
+
+    // Fix the queries limits
+    $query_count = $query_count < 1 ? 1 : ($query_count > 500 ? 500 : $query_count);
 
-// Fix the queries limits
-$query_count = $query_count < 1 ? 1 : ($query_count > 500 ? 500 : $query_count);
+    $b = new Benchmark();
+    $b->bench_updates($query_count);
+}
 
-$b = new Benchmark();
-$b->bench_updates($query_count);
+main();