fix

diff --git a/helm/matita/scripts/public_html/bench.php b/helm/matita/scripts/public_html/bench.php
index 00e964a2e053688fb27dc5d7712b71959d900d4d..d1a5fc53eeb3f7721878873a15d2b77cc8534f5e 100644 (file)
--- a/helm/matita/scripts/public_html/bench.php
+++ b/helm/matita/scripts/public_html/bench.php
@@ -6,42 +6,40 @@
 // query ::= name "@@@" sql
 //
 
-$query_limit = 30;
-
-$quey_all = urlencode("Whole content:@@@select * from bench LIMIT 0,$query_limit;");
+$quey_all = urlencode("Whole content:@@@select * from bench;");
 $query_fail = urlencode(
   "Number of failures:@@@" .
-  "select mark, count(distinct test) as fail_no from bench where result = 'fail' group by mark order by mark desc LIMIT 0,$query_limit;"
+  "select mark, count(distinct test) as fail_no from bench where result = 'fail' group by mark order by mark desc;"
   . "###" . 
   "Tests failed:@@@" .
-  "select distinct mark, test, result from bench where result = 'fail' order by mark desc LIMIT 0,$query_limit;" 
+  "select distinct mark, test, result from bench where result = 'fail' order by mark desc;" 
 );
 $query_gc = urlencode(
   "GC usage @@@" .
-  "select bench.mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time)) - SUM(TIME_TO_SEC(bench1.time))) as gc_hoverhead from bench, bench as bench1 where bench.mark = bench1.mark and bench.test = bench1.test and bench.options = 'gc-on' and bench1.options = 'gc-off' and bench.compilation = bench1.compilation group by mark LIMIT 0,$query_limit;"
+  "select bench.mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time)) - SUM(TIME_TO_SEC(bench1.time))) as gc_hoverhead from bench, bench as bench1 where bench.mark = bench1.mark and bench.test = bench1.test and bench.options = 'gc-on' and bench1.options = 'gc-off' and bench.compilation = bench1.compilation group by mark;"
   . "###" . 
   "GC usage (opt)@@@" .
-  "select bench.mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time)) - SUM(TIME_TO_SEC(bench1.time))) as gc_hoverhead from bench, bench as bench1 where bench.mark = bench1.mark and bench.test = bench1.test and bench.options = 'gc-on' and bench1.options = 'gc-off' and bench.compilation = bench1.compilation and bench.compilation = 'opt' group by mark LIMIT 0,$query_limit;"
+  "select bench.mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time)) - SUM(TIME_TO_SEC(bench1.time))) as gc_hoverhead from bench, bench as bench1 where bench.mark = bench1.mark and bench.test = bench1.test and bench.options = 'gc-on' and bench1.options = 'gc-off' and bench.compilation = bench1.compilation and bench.compilation = 'opt' group by mark;"
   . "###" . 
   "GC usage (byte)@@@" .
-  "select bench.mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time)) - SUM(TIME_TO_SEC(bench1.time))) as gc_hoverhead from bench, bench as bench1 where bench.mark = bench1.mark and bench.test = bench1.test and bench.options = 'gc-on' and bench1.options = 'gc-off' and bench.compilation = bench1.compilation and bench.compilation = 'byte' group by mark LIMIT 0,$query_limit;"
+  "select bench.mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time)) - SUM(TIME_TO_SEC(bench1.time))) as gc_hoverhead from bench, bench as bench1 where bench.mark = bench1.mark and bench.test = bench1.test and bench.options = 'gc-on' and bench1.options = 'gc-off' and bench.compilation = bench1.compilation and bench.compilation = 'byte' group by mark;"
   
 );
 $query_auto = urlencode(
-  "Auto (with GC):@@@select mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time))) as time from bench where test='auto.ma' and options = 'gc-on' group by mark order by mark desc LIMIT 0,$query_limit;"
+  "Auto (with GC):@@@select mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time))) as time from bench where test='auto.ma' and options = 'gc-on' group by mark order by mark desc;"
   . "###" . 
-  "Auto (without GC):@@@select mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time))) as time from bench where test='auto.ma' and options = 'gc-off' group by mark order by mark desc LIMIT 0,$query_limit;"
+  "Auto (without GC):@@@select mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time))) as time from bench where test='auto.ma' and options = 'gc-off' group by mark order by mark desc;"
   #  . "###" . 
-  # "GC overhead@@@select bench.mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time)) - SUM(TIME_TO_SEC(bench1.time))) as gc_hoverhead from bench, bench as bench1 where bench.mark = bench1.mark and bench.test = bench1.test and bench.options = 'gc-on' and bench1.options = 'gc-off' and bench.compilation = bench1.compilation and bench.test = 'auto.ma' group by mark LIMIT 0,$query_limit;"
+  # "GC overhead@@@select bench.mark, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time)) - SUM(TIME_TO_SEC(bench1.time))) as gc_hoverhead from bench, bench as bench1 where bench.mark = bench1.mark and bench.test = bench1.test and bench.options = 'gc-on' and bench1.options = 'gc-off' and bench.compilation = bench1.compilation and bench.test = 'auto.ma' group by mark;"
 );
 
-$query_csc = urlencode("Performances (byte and GC) per mark@@@select mark, SEC_TO_TIME(SUM(TIME_TO_SEC(time))) as sum_time, SEC_TO_TIME(SUM(TIME_TO_SEC(timeuser))) as sum_timeuser from bench where options = 'gc-on' and compilation = 'byte'group by mark order by mark desc LIMIT 0,$query_limit;"
+$query_csc = urlencode("Performances (byte and GC) per mark@@@select mark, SEC_TO_TIME(SUM(TIME_TO_SEC(time))) as sum_time, SEC_TO_TIME(SUM(TIME_TO_SEC(timeuser))) as sum_timeuser from bench where options = 'gc-on' and compilation = 'byte'group by mark order by mark desc;"
 );
 
-$query_csc_opt = urlencode("Performances (opt and GC) per mark@@@select mark, SEC_TO_TIME(SUM(TIME_TO_SEC(time))) as sum_time, SEC_TO_TIME(SUM(TIME_TO_SEC(timeuser))) as sum_timeuser from bench where options = 'gc-on' and compilation = 'opt'group by mark order by mark desc LIMIT 0,$query_limit;"
+$query_csc_opt = urlencode("Performances (opt and GC) per mark@@@select mark, SEC_TO_TIME(SUM(TIME_TO_SEC(time))) as sum_time, SEC_TO_TIME(SUM(TIME_TO_SEC(timeuser))) as sum_timeuser from bench where options = 'gc-on' and compilation = 'opt'group by mark order by mark desc;"
 );
 
-$query_total = urlencode("Number of compiled tests@@@select mark, COUNT(DISTINCT test) as N from bench group by mark order by mark desc LIMIT 0,$query_limit;"
+$query_total = urlencode("Number of compiled tests@@@select mark, COUNT(DISTINCT test) as N from bench group by mark order by mark desc;"
 #  . "###" .
 #"Lost tests"
 );
@@ -69,20 +67,54 @@ $query_total = urlencode("Number of compiled tests@@@select mark, COUNT(DISTINCT
     <h2>Custom Query</h2>
     <form action="composequery.php" method="get">
     <table>
-  <tr><td>Marks:</td><td> 
-    <? array_to_combo("mark",query("select distinct mark from bench order by mark desc;")); ?></td></tr>
-  <tr><td>Compilations:</td><td> 
-    <? array_to_combo("compilation",query("select distinct compilation from bench;")); ?></td></tr>
-  <tr><td>Options:</td><td>  
-    <? array_to_combo("options",query("select distinct options from bench;")); ?></td></tr>
-  <tr><td>Tests:</td><td>    
-    <? array_to_combo("test",query("select distinct test from bench;")); ?></td></tr>
-  <tr><td>Test results:</td><td>
-    <? array_to_combo("result",query("select distinct result from bench;")); ?></td></tr>
-  <tr><td>Group By: </td><td>
-    <? array_to_combo("groupby",array(array("mark","options"))); ?></td></tr>
-    <tr><td><input type="submit" value="Submit"/></td></tr>
-    </table>
-    </form>
-  </body>
+  <tr>
+    <td>Marks:</td>
+    <td> 
+      <? array_to_combo("mark",
+            query("select distinct mark from bench order by mark desc;")); ?>
+    </td>
+  </tr>
+  <tr>
+    <td>Compilations:</td>
+    <td> 
+      <? array_to_combo("compilation",
+           query("select distinct compilation from bench;")); ?>
+    </td>
+  </tr>
+  <tr>
+    <td>Options:</td>
+    <td>  
+      <?array_to_combo("options",query("select distinct options from bench;"));?>
+    </td>
+  </tr>
+  <tr>
+    <td>Tests:</td>
+    <td>    
+      <? array_to_combo("test",query("select distinct test from bench;")); ?>
+    </td>
+  </tr>
+  <tr>
+    <td>Test results:</td>
+    <td>
+      <? array_to_combo("result",query("select distinct result from bench;")); ?>
+    </td>
+  </tr>
+  <tr>
+    <td>Group By: </td>
+    <td>
+      <? array_to_combo("groupby",array(array("mark","options"))); ?>
+    </td>
+  </tr>
+  <tr>
+    <td>Limit: </td>
+    <td>
+      <? array_to_combo("limit",array(array("30","50","-1"))); ?>
+    </td>
+  </tr>
+  <tr>
+    <td><input type="submit" value="Submit"/></td>
+  </tr>
+ </table>
+</form>
+</body>
 </html>