X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2Fscripts%2Fcrontab.sh;h=648a1a709c07d1cc4b25e758c003df1d6cc68e8c;hb=f9410c56ba4645668d5246654df1ba816ec249b1;hp=ba63e00d2d698c3414dbcedc761c935db29f2b6f;hpb=d6b38a5565abd0efa64578639a097761ea298dbc;p=helm.git

diff --git a/helm/matita/scripts/crontab.sh b/helm/matita/scripts/crontab.sh
index ba63e00d2..648a1a709 100644
--- a/helm/matita/scripts/crontab.sh
+++ b/helm/matita/scripts/crontab.sh
@@ -1,8 +1,12 @@
 #!/bin/bash
-MARK=`date +%Y%m%d`
-LASTMARK=`date -d yesterday +%Y%m%d`
-TMPDIRNAME=.__${MARK}_crontab
+TODAY=`date +%Y%m%d`
+YESTERDAY=`date -d yesterday +%Y%m%d`
+TMPDIRNAME=$HOME/__${TODAY}_crontab
 CVSROOT=":ext:$USER@marcello.cs.unibo.it:/home/faculty/PROJECTS/cvs/helm"
+SHELLTIME2CENTSPHP=helm/matita/scripts/shell_time2cents.php
+SHELLADDERPHP=helm/matita/scripts/shell_adder.php
+COMMONPHP=helm/matita/scripts/public_html/common.php
+
 
 OLD=$PWD
 rm -rf $TMPDIRNAME 
@@ -11,42 +15,53 @@ cd $TMPDIRNAME
 cvs -d $CVSROOT co helm/matita/scripts 1>/dev/null 2>/dev/null
 helm/matita/scripts/profile_cvs.sh 2> LOG
 
-CUR_TIME=`/usr/bin/php4 -c /etc/php4/apache/php.ini - shell_adder.php -- public_html/common.php "select SEC_TO_TIME(SUM(TIME_TO_SEC(time))) from bench where mark = \"$MARK\" group by mark;"`
-OLD_TIME=`/usr/bin/php4 -c /etc/php4/apache/php.ini - shell_adder.php -- public_html/common.php  "select mark, SEC_TO_TIME(SUM(TIME_TO_SEC(time))) from bench where mark = \"$LASTMARK\" group by mark;"`
+MARK=`echo "select distinct mark from bench where mark like '$TODAY%' order by mark" | mysql -u helm matita | tail -n 1`
+LASTMARK=`echo "select distinct mark from bench where mark like '$YESTERDAY%' order by mark" | mysql -u helm matita | tail -n 1`
+
+if [ -z "$MARK" ]; then
+  echo "No benchmark records for $TODAY"
+  exit 1
+fi
 
-if [ -z "$CUR_TIME" -o -z "$OLD_TIME" ]; then
-  echo "No benchamks records for $MARK"
+if [ -z "$LASTMARK" ]; then
+  echo "No benchmark records for $YESTERDAY"
   exit 1
 fi
 
-((DELTA=`/usr/bin/php4 -c /etc/php4/apache/php.ini - shell_time2cents.php -- public_html/common.php $CUR_TIME` - `/usr/bin/php4 -c /etc/php4/apache/php.ini - shell_time2cents.php -- public_html/common.php $OLD_TIME`))
+CUR_TIME=`/usr/bin/php4 -c /etc/php4/apache/php.ini -f $SHELLADDERPHP -- $COMMONPHP "select SEC_TO_TIME(SUM(TIME_TO_SEC(time))) from bench where mark = \"$MARK\" group by mark;"`
+OLD_TIME=`/usr/bin/php4 -c /etc/php4/apache/php.ini -f $SHELLADDERPHP -- $COMMONPHP  "select SEC_TO_TIME(SUM(TIME_TO_SEC(time))) from bench where mark = \"$LASTMARK\" group by mark;"`
+
+CUR_CENTS=`/usr/bin/php4 -c /etc/php4/apache/php.ini -f $SHELLTIME2CENTSPHP -- $COMMONPHP $CUR_TIME`
+OLD_CENTS=`/usr/bin/php4 -c /etc/php4/apache/php.ini -f $SHELLTIME2CENTSPHP -- $COMMONPHP $OLD_TIME`
+
+((DELTA=$CUR_CENTS-$OLD_CENTS))
 if [ $DELTA -lt 0 ]; then
   PERC=0
 else
   ((PERC=100 * $DELTA))
-  ((PERC=$PERC / `/usr/bin/php4 -c /etc/php4/apache/php.ini - shell_time2cents.php -- public_html/common.php $OLD_TIME`))
+  ((PERC=$PERC / $OLD_CENTS))
 fi
 if [ $PERC -ge 5 ]; then
   cat <<EOT
   REPORT FOR `date`
   http://mowgli.cs.unibo.it/~tassi/bench.php
 
-  PREFORMANCE LOSS DETECTED
+  PERFORMANCE LOSS DETECTED (MARK $MARK vs MARK $LASTMARK)
   is $CUR_TIME sec 
   was $OLD_TIME sec
 
 EOT
 fi
 
-CUR_FAIL=`/usr/bin/php4 -c /etc/php4/apache/php.ini - shell_adder.php -- public_html/common.php "select count(distinct test) from bench where mark = \"$MARK\" and result = 'fail';"`
-OLD_FAIL=`/usr/bin/php4 -c /etc/php4/apache/php.ini - shell_adder.php -- public_html/common.php "select count(distinct test) from bench where mark = \"$LASTMARK\" and result = 'fail';"`
+CUR_FAIL=`/usr/bin/php4 -c /etc/php4/apache/php.ini -f $SHELLADDERPHP -- $COMMONPHP "select count(distinct test) from bench where mark = \"$MARK\" and result = 'fail';"`
+OLD_FAIL=`/usr/bin/php4 -c /etc/php4/apache/php.ini -f $SHELLADDERPHP -- $COMMONPHP "select count(distinct test) from bench where mark = \"$LASTMARK\" and result = 'fail';"`
 
 if [ $CUR_FAIL -gt $OLD_FAIL ]; then
   cat <<EOT
   REPORT FOR `date`
   http://mowgli.cs.unibo.it/~tassi/bench.php
 
-  MORE BROKEN TESTS DETECTED
+  MORE BROKEN TESTS DETECTED (MARK $MARK vs MARK $LASTMARK)
   now broken:
   `echo "select distinct test from bench where mark = \"$MARK\" and result = 'fail';" | mysql -u helm -h mowgli.cs.unibo.it matita`
   were broken:
@@ -57,5 +72,5 @@ EOT
 fi
 
 cd $OLD
-rm -rf $TMPDIRNAME
+#rm -rf $TMPDIRNAME