Changeset 68713c9 for common

Timestamp:

08/17/2007 04:24:47 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

e5842d6

Parents:

3abe9d7

Message:

Dump build time using Bash $SECONDS internal variable instead of using date calls + Perl-based calculations.

Location:

common

Files:

• create-sbu_du-report.sh (modified) (2 diffs)
• libs/func_wrt_Makefile (modified) (6 diffs)

common/create-sbu_du-report.sh

@@ -54 +54 @@
 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`
+SBU_UNIT=`sed -n 's/^Totalseconds:\s\([[: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"
@@ -71 +71 @@
 # Start SBU calculation
 # Build time
-  TIME=`sed -n 's/^Totalseconds:\s\([[:digit:]]*.[[:digit:]]*\)$/\1/p' $log`
+  TIME=`sed -n 's/^Totalseconds:\s\([[: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')';`
+  SBU=`perl -e 'printf "%.1f" , ('$TIME' / '$SBU_UNIT')';`
 
 # Append SBU value to SBU2 for grand total
-  SBU2=`perl -e 'printf "%.3f" , ('$SBU2' + '$SBU')';`
+  SBU2=`perl -e 'printf "%.1f" , ('$SBU2' + '$SBU')';`
 
 # Start disk usage calculation

common/libs/func_wrt_Makefile

@@ -41 +41 @@
 PRT_DU         = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found \$(MOUNT_PT) \`\n"
 PRT_DU_CR      = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found / \`\n"
-TIME_MARK      = \`date +%s.%N\`
-BUILD_TIME     = perl -e "printf \"\nTotalseconds: %.3f\", ('\$\$end' - '\$\$start')"
 
 ADD_REPORT       = $REPORT
@@ -235 +233 @@
 (
 cat << EOF
-        @start=\$(TIME_MARK) && \\
-        export ${MOUNT_ENV}=\$(MOUNT_PT) && \\
+        @export ${MOUNT_ENV}=\$(MOUNT_PT) && \\
         ${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@ 2>&1 && \\
-        end=\$(TIME_MARK) && \$(BUILD_TIME) >>logs/\$@ && \\
         \$(PRT_DU) >>logs/\$@
 EOF
@@ -251 +247 @@
 (
 cat << EOF
-        @start=\$(TIME_MARK) && \\
-        source ~/.bashrc && \\
+        @source ~/.bashrc && \\
         \$(CMDSDIR)/`dirname $file`/\$@ >> logs/\$@ 2>&1 && \\
-        end=\$(TIME_MARK) && \$(BUILD_TIME) >>logs/\$@ && \\
         \$(PRT_DU) >>logs/\$@
 EOF
@@ -266 +260 @@
 (
 cat << EOF
-        @start=\$(TIME_MARK) && \\
-        source envars && \\
+        @source envars && \\
         \$(crCMDSDIR)/`dirname $file`/\$@ >>logs/\$@ 2>&1 && \\
-        end=\$(TIME_MARK) && \$(BUILD_TIME) >>logs/\$@ && \\
         \$(PRT_DU_CR) >>logs/\$@
 EOF
@@ -286 +278 @@
 (
 cat << EOF
-        @start=\$(TIME_MARK) && \\
-        cp -v \$(MOUNT_PT)/sources/fstab \$(MOUNT_PT)/etc/fstab >>logs/\$@ 2>&1 && \\
-        end=\$(TIME_MARK) && \$(BUILD_TIME) >>logs/\$@ && \\
+        @cp -v \$(MOUNT_PT)/sources/fstab \$(MOUNT_PT)/etc/fstab >>logs/\$@ 2>&1 && \\
         \$(PRT_DU) >>logs/\$@
 EOF
@@ -299 +289 @@
 (
 cat << EOF
-        @start=\$(TIME_MARK) && \\
-        cp -v /sources/fstab /etc/fstab >>logs/\$@ 2>&1 && \\
-        end=\$(TIME_MARK) && \$(BUILD_TIME) >>logs/\$@ && \\
+        @cp -v /sources/fstab /etc/fstab >>logs/\$@ 2>&1 && \\
         \$(PRT_DU_CR) >>logs/\$@
 EOF