fix

diff --git a/helm/matita/scripts/public_html/bench.php b/helm/matita/scripts/public_html/bench.php
index d1a5fc53eeb3f7721878873a15d2b77cc8534f5e..0a09d40abe27be706fec73c03e67cb295462ddc7 100644 (file)
--- a/helm/matita/scripts/public_html/bench.php
+++ b/helm/matita/scripts/public_html/bench.php
@@ -5,45 +5,58 @@
 // queries ::= query | query "###" queries
 // query ::= name "@@@" sql
 //
+$limits = array("30","50","-1");
 
-$quey_all = urlencode("Whole content:@@@select * from bench;");
+$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;"
+  "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;" 
+  "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;"
+  "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;"
+  "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;"
+  "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;"
+  "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;"
+  "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;"
+  # "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;"
+$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;"
+$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;"
+$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"
 );
 
+function minus1_to_all($s){
+  if ($s = "-1") return "all" else return $s;
+}
+
+function links_of($name,$q){
+  echo "<li>$name";
+  foreach($limits as $l) {
+    echo "<a href=\"showquery.php?query=$q LIMIT 0,$l; \">$l</a>&nbsp;";
+  }
+  echo "</li>";
+}
+
 ?>
 
 <html>
@@ -55,13 +68,13 @@ $query_total = urlencode("Number of compiled tests@@@select mark, COUNT(DISTINCT
     <h2>Common Queries</h2>
     <p>
       <ul>
-      <li><a href="showquery.php?query=<? echo $query_fail; ?>">Broken tests</a></li>
-      <li><a href="showquery.php?query=<? echo $query_gc; ?>">Garbage collector killer</a></li>
-      <li><a href="showquery.php?query=<? echo $query_auto; ?>">Auto performances</a></li>
-      <li><a href="showquery.php?query=<? echo $query_csc; ?>">Global performances (bytecode)</a></li>
-      <li><a href="showquery.php?query=<? echo $query_csc_opt; ?>">Global performances (nativecode)</a></li>
-      <li><a href="showquery.php?query=<? echo $query_total; ?>">Number of compiled tests</a></li>
-      <li><a href="showquery.php?query=<? echo $quey_all; ?>">All table contents</a></li>
+      <? links_of("Broken tests",$query_fail) ?>
+      <? links_of("Garbage collector killer",$query_gc) ?>
+      <? links_of("Auto performances",$query_auto) ?>
+      <? links_of("Global performances (bytecode)",$query_csc) ?>
+      <? links_of("Global performances (nativecode)",$query_csc_opt) ?>
+      <? links_of("Number of compiled tests",$query_total) ?>
+      <? links_of("All table contents",$quey_all) ?>
       </ul>
     </p>
     <h2>Custom Query</h2>
@@ -108,7 +121,7 @@ $query_total = urlencode("Number of compiled tests@@@select mark, COUNT(DISTINCT
   <tr>
     <td>Limit: </td>
     <td>
-      <? array_to_combo("limit",array(array("30","50","-1"))); ?>
+      <? array_to_combo("limit",array($limits)); ?>
     </td>
   </tr>
   <tr>