Changeset 0210014 for common/create-sbu_du-report.sh

Timestamp:

05/26/2007 09:16:18 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

c6f33fb

Parents:

81fca31

Message:

Replaced "time" and "du" by "perl" fot timming and SBU-DU report calculations.
Thanks to Dan Nicholson and Ag. D. Hatzimanikas for the sugestions and patches.

File:

• common/create-sbu_du-report.sh (modified) (4 diffs)

common/create-sbu_du-report.sh

@@ -6 +6 @@
 LOGSDIR=$1
 VERSION=$2
+
+LINE="================================================================================"
 
 # Make sure that we have a directory as first argument
@@ -26 +28 @@
 REPORT="$VERSION"-SBU_DU-$(date --iso-8601).report
 
+[ -f $REPORT ] && : >$REPORT
+
 # Dump generation time stamp and book version
 echo -e "\n`date`\n" > "$REPORT"
@@ -45 +49 @@
 
 # Parse only that logs that have time data
-BUILDLOGS=`grep -l "^real\>" $LOGSDIR/*`
+BUILDLOGS="`grep -l "^Totalseconds:" ${LOGSDIR}/*`"
 
 # Match the first timed log to extract the SBU unit value from it
-BASELOG=`grep -l "^real\>" $LOGSDIR/* | head -n1`
-echo -e "\n\nUsing $BASELOG to obtain the SBU unit value." >> "$REPORT"
-BASEMINUTES=`grep "^real\>" $BASELOG | cut -f2 | sed -e 's/m.*//'`
-BASESECONDS=`grep "^real\>" $BASELOG | cut -f2 | sed -e 's/.*m//;s/s//'`
-SBU_UNIT=`echo "scale=3; $BASEMINUTES * 60 + $BASESECONDS" | bc`
-echo -e "The SBU unit value is equal to $SBU_UNIT seconds.\n" >> "$REPORT"
+BASELOG=`grep -l "^Totalseconds:" $LOGSDIR/* | head -n1`
+echo -e "\nUsing ${BASELOG#*[[:digit:]]-} to obtain the SBU unit value."
+SBU_UNIT=`sed -n 's/^Totalseconds:\s\([[:digit:]]*.[[:digit:]]*\)$/\1/p' $BASELOG`
+echo -e "\nThe SBU unit value is equal to $SBU_UNIT seconds.\n"
+echo -e "\n\n$LINE\n\nThe SBU unit value is equal to $SBU_UNIT seconds.\n" >> "$REPORT"
 
 # Set the first value to 0 for grand totals calculation
@@ -60 +63 @@
 INSTALLMB2=0
 
+# Start the loop
 for log in $BUILDLOGS ; do
 
-#Start SBU calculation
-  # Build time
-  BUILDTIME=`grep "^real\>" $log | cut -f2`
-  # Build time in seconds
-  MINUTES=`grep "^real\>" $log | cut -f2 | sed -e 's/m.*//'`
-  SECS=`grep "^real\>" $log | cut -f2 | sed -e 's/.*m//;s/s//'`
-  TIME=`echo "scale=3; $MINUTES * 60 + $SECS" | bc`
-  # Calculate build time in SBU
-  SBU=`echo "scale=3; $TIME / $SBU_UNIT" | bc`
-  # Append SBU value to SBU2 for grand total
-  SBU2="$SBU2 + $SBU"
+# Strip the filename
+  PACKAGE="${log#*[[:digit:]]*-}"
 
-#Start disk usage calculation
-  # Disk usage before unpacking the package
+# Start SBU calculation
+# Build time
+  TIME=`sed -n 's/^Totalseconds:\s\([[:digit:]]*.[[:digit:]]*\)$/\1/p' $log`
+  SECS=`perl -e 'print ('$TIME' % '60')';`
+  MINUTES=`perl -e 'printf "%.0f" , (('$TIME' - '$SECS') / '60')';`
+  SBU=`perl -e 'printf "%.3f" , ('$TIME' / '$SBU_UNIT')';`
+
+# Append SBU value to SBU2 for grand total
+  SBU2=`perl -e 'printf "%.3f" , ('$SBU2' + '$SBU')';`
+
+# Start disk usage calculation
+# Disk usage before unpacking the package
   DU1=`grep "^KB: " $log | head -n1 | cut -f1 | sed -e 's/KB: //'`
-  DU1MB=`echo "scale=2; $DU1 / 1024" | bc`
-  # Disk usage before deleting the source and build dirs
+  DU1MB=`perl -e 'printf "%.3f" , ('$DU1' / '1024')';`
+# Disk usage before deleting the source and build dirs
   DU2=`grep "^KB: " $log | tail -n1 | cut -f1 | sed -e 's/KB: //'`
-  DU2MB=`echo "scale=2; $DU2 / 1024" | bc`
-  # Calculate disk space required to do the build
-  REQUIRED1=`echo "$DU2 - $DU1" | bc`
-  REQUIRED2=`echo "scale=2; $DU2MB - $DU1MB" | bc`
+  DU2MB=`perl -e 'printf "%.3f" , ('$DU2' / '1024')';`
+# Calculate disk space required to do the build
+  REQUIRED1=`perl -e 'print ('$DU2' - '$DU1')';`
+  REQUIRED2=`perl -e 'printf "%.3f" , ('$DU2MB' - '$DU1MB')';`
 
-  # Append installed files disk usage to the previous entry,
-  # except for the first parsed log
+# Append installed files disk usage to the previous entry,
+# except for the first parsed log
   if [ "$log" != "$BASELOG" ] ; then
-    INSTALL=`echo "$DU1 - $DU1PREV" | bc`
-    INSTALLMB=`echo "scale=2; $DU1MB - $DU1MBPREV" | bc`
-    echo -e "Installed files disk usage:\t\t\t\t$INSTALL KB or $INSTALLMB MB\n" >> "$REPORT"
+    INSTALL=`perl -e 'print ('$DU1' - '$DU1PREV')';`
+    INSTALLMB=`perl -e 'printf "%.3f" , ('$DU1MB' - '$DU1MBPREV')';`
+    echo -e "Installed files disk usage:\t\t\t\t$INSTALL KB or $INSTALLMB MB\n" >> $REPORT
     # Append install values for grand total
-    INSTALL2="$INSTALL2 + $INSTALL"
-    INSTALLMB2="$INSTALLMB2 + $INSTALLMB"
+    INSTALL2=`perl -e 'printf "%.3f" , ('$INSTALL2' + '$INSTALL')';`
+    INSTALLMB2=`perl -e 'printf "%.3f" , ('$INSTALLMB2' + '$INSTALLMB')';`
   fi
 
-  # Set variables to calculate installed files disk usage
+# Set variables to calculate installed files disk usage
   DU1PREV=$DU1
   DU1MBPREV=$DU1MB
 
-  # Append log name
-  echo -e "\n\t$log" >> "$REPORT"
-
-  # Dump time values
-  echo -e "Build time is:\t\t\t$BUILDTIME" >> "$REPORT"
-  echo -e "Build time in seconds is\t$TIME" >> "$REPORT"
-  echo -e "Approximate SBU time is:\t$SBU" >> "$REPORT"
-
-  # Dump disk usage values
-  echo -e "\nDisk usage before unpacking the package:\t\t$DU1 KB or $DU1MB MB" >> "$REPORT"
-  echo -e "Disk usage before deleting the source and build dirs:\t$DU2 KB or $DU2MB MB" >> "$REPORT"
-  echo -e "Required space to build the package:\t\t\t$REQUIRED1 KB or $REQUIRED2 MB\n" >> "$REPORT"
+# Dump time and disk usage values
+  echo -e "$LINE\n\t\t\t\t[$PACKAGE]\n" >> $REPORT
+  echo -e "Build time is:\t\t\t\t\t\t$MINUTES minutes and $SECS seconds" >> $REPORT
+  echo -e "Build time in seconds is:\t\t\t\t$TIME" >> $REPORT
+  echo -e "Approximate SBU time is:\t\t\t\t$SBU" >> $REPORT
+  echo -e "Disk usage before unpacking the package:\t\t$DU1 KB or $DU1MB MB" >> $REPORT
+  echo -e "Disk usage before deleting the source and build dirs:\t$DU2 KB or $DU2MB MB" >> $REPORT
+  echo -e "Required space to build the package:\t\t\t$REQUIRED1 KB or $REQUIRED2 MB" >> $REPORT
 
 done
 
 # Dump grand totals
-TOTALSBU=`echo "scale=3; ${SBU2}" | bc`
-echo -e "\nTotal time required to build the systen:\t$TOTALSBU SBU\n" >> "$REPORT"
-TOTALINSTALL=`echo "${INSTALL2}" | bc`
-TOTALINSTALLMB=`echo "scale=2; ${INSTALLMB2}" | bc`
-echo -e "Total Installed files disk usage
-    (including /tools but not /sources):\t$TOTALINSTALL KB or $TOTALINSTALLMB MB\n" >> "$REPORT"
-
-
+echo -e "\n$LINE\n\nTotal time required to build the systen:\t\t$SBU2  SBU" >> $REPORT
+# Total disk usage: including /tools but not /sources.
+echo -e "Total Installed files disk usage:\t\t\t$INSTALL2 KB or $INSTALLMB2 MB" >> $REPORT