X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2Fscripts%2Fpublic_html%2Fbench.php;h=2ee5408257b42e1fb11aa1ac20505deac8a0e501;hb=771ee8b9d122fa963881c876e86f90531bb7434f;hp=3642a1dc0e152178f5d712fecf56d3a32e662e92;hpb=93c731a94ceef8250568a3c118b035a6ebced8fa;p=helm.git

diff --git a/helm/matita/scripts/public_html/bench.php b/helm/matita/scripts/public_html/bench.php
index 3642a1dc0..2ee540825 100644
--- a/helm/matita/scripts/public_html/bench.php
+++ b/helm/matita/scripts/public_html/bench.php
@@ -5,14 +5,14 @@
 // queries ::= query | query "###" queries
 // query ::= name "@@@" sql
 //
-$limits = array("20","50","100","-1");
+$limits = array("20","50","100");
   
-$quey_all = urlencode("Whole content:@@@select * from bench***");
+$quey_all = urlencode("Whole content:@@@select * from bench order by mark desc***");
 $query_fail = urlencode(
-  "Number of failures:@@@" .
+  "Number of failures@@@" .
   "select mark, count(distinct test) as fail_no from bench where result = 'fail' group by mark order by mark desc***"
   . "###" . 
-  "Tests failed:@@@" .
+  "Tests failed@@@" .
   "select distinct mark, test, result from bench where result = 'fail' order by mark desc***" 
 );
 $query_gc = urlencode(
@@ -27,17 +27,17 @@ $query_gc = urlencode(
   
 );
 $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"
 );
 
-$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 bench.mark ,bench_svn.revision as revision, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time))) as sum_time, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.timeuser))) as sum_timeuser from bench, bench_svn where bench.options = 'gc-on' and bench.compilation = 'byte' and bench_svn.mark = bench.mark group by bench.mark order by bench.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 bench.mark,bench_svn.revision as revision, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.time))) as sum_time, SEC_TO_TIME(SUM(TIME_TO_SEC(bench.timeuser))) as sum_timeuser from bench, bench_svn where bench.options = 'gc-on' and bench.compilation = 'opt' and bench_svn.mark = bench.mark group by bench.mark order by bench.mark desc"
 );
 
 $query_total = urlencode(
@@ -55,11 +55,18 @@ function minus1_to_all($s){
 }
 
 function links_of($name,$q,$limits){
-  echo "<li>$name&nbsp;";
-  foreach($limits as $l) {
-    $q1 = str_replace(urlencode("***"), " LIMIT 0,$l", $q);
-    echo "<a href=\"showquery.php?query=$q1;\">" . 
-          minus1_to_all($l) . "</a>&nbsp;";
+  echo "<li>$name :&nbsp;&nbsp;&nbsp;";
+  if (strpos($q, urlencode("***")) === false) {
+    echo "<a href=\"showquery.php?query=$q;\">all</a>";
+  } else {
+    foreach($limits as $l) {
+      $q1 = str_replace(urlencode("***"), " LIMIT 0,$l", $q);
+      echo "<a href=\"showquery.php?query=$q1;\">" . 
+            minus1_to_all($l) . "</a>&nbsp;&nbsp;";
+    }
+      $q1 = str_replace(urlencode("***"), " ", $q);
+      echo "<a href=\"showquery.php?query=$q1;\">" . 
+            minus1_to_all("-1") . "</a>&nbsp;&nbsp;";
   }
   echo "</li>";
 }
@@ -132,7 +139,7 @@ function links_of($name,$q,$limits){
     </td>
   </tr>
   <tr>
-    <td><input type="submit" value="Submit"/></td>
+    <td><input type="submit" value="Submit" class="button" /></td>
   </tr>
  </table>
 </form>