Menu
▾
▴
[Osdldbt-svn] SF.net SVN: osdldbt: [1449] trunk/dbt3/scripts
|
From: <ma...@us...> - 2006-08-11 19:50:58
|
Revision: 1449 Author: markwkm Date: 2006-08-11 12:50:55 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/osdldbt/?rev=1449&view=rev Log Message: ----------- Updated scripts to not run either refresh streams with a '-z' flag to run_workload.sh and updated postprocessing accordingly. Modified Paths: -------------- trunk/dbt3/scripts/get_composite.sh.in trunk/dbt3/scripts/graph_query_time.pl trunk/dbt3/scripts/pgsql/get_power.sh trunk/dbt3/scripts/pgsql/power_test.sh.in trunk/dbt3/scripts/pgsql/throughput_stream_wrapper.sh.in trunk/dbt3/scripts/pgsql/throughput_test.sh.in trunk/dbt3/scripts/run_workload.sh.in Modified: trunk/dbt3/scripts/get_composite.sh.in =================================================================== --- trunk/dbt3/scripts/get_composite.sh.in 2006-08-11 04:10:13 UTC (rev 1448) +++ trunk/dbt3/scripts/get_composite.sh.in 2006-08-11 19:50:55 UTC (rev 1449) @@ -13,7 +13,7 @@ # Rewritten from perl to bash. # -while getopts "i:n:o:p:s:v" OPT; do +while getopts "i:n:o:p:s:vz" OPT; do case ${OPT} in i) INFILE=${OPTARG} @@ -34,12 +34,15 @@ set -x SHELL="${SHELL} +x" ;; + z) + NO_REFRESH_FLAG="-z" + ;; esac done SCRIPT_DIR="@TOPDIR@/scripts/@DATABASE_TO_USE@"; -POWER=`${SHELL} ${SCRIPT_DIR}/get_power.sh -i ${INFILE} -p ${PERFNUM} -s ${SCALE_FACTOR}` +POWER=`${SHELL} ${SCRIPT_DIR}/get_power.sh -i ${INFILE} -p ${PERFNUM} -s ${SCALE_FACTOR} ${NO_REFRESH_FLAG}` THROUGHPUT=`${SHELL} ${SCRIPT_DIR}/get_throughput.sh -i ${INFILE} -p ${PERFNUM} -s ${SCALE_FACTOR} -n ${STREAMS}` COMPOSITE=`echo "scale=2; sqrt(${POWER} * ${THROUGHPUT})" | bc -l` Modified: trunk/dbt3/scripts/graph_query_time.pl =================================================================== --- trunk/dbt3/scripts/graph_query_time.pl 2006-08-11 04:10:13 UTC (rev 1448) +++ trunk/dbt3/scripts/graph_query_time.pl 2006-08-11 19:50:55 UTC (rev 1449) @@ -5,9 +5,11 @@ use FileHandle; my $infile; +my $no_refresh; GetOptions( - "if=s" => \$infile + "if=s" => \$infile, + 'z' => \$no_refresh ); my $raw_data; @@ -18,14 +20,14 @@ sub average() { - my $count = scalar( @data ); - my $total = 0; + my $count = scalar(@data); + my $total = 0; - for ( my $i = 0; $i < $count; $i++ ) { - $total += $data[ $i ]; - } + for (my $i = 0; $i < $count; $i++) { + $total += $data[ $i ]; + } - return $total / $count; + return $total / $count; } # Generate data file for power query times, for the first iteration only. @@ -52,8 +54,10 @@ system "grep 'PERF1.POWER.Q20 ' $infile | awk '{print \"20\", \$11}' >> $dirname/q_time_p.data"; system "grep 'PERF1.POWER.Q21 ' $infile | awk '{print \"21\", \$11}' >> $dirname/q_time_p.data"; system "grep 'PERF1.POWER.Q22 ' $infile | awk '{print \"22\", \$11}' >> $dirname/q_time_p.data"; -system "grep 'PERF1.POWER.RF1 ' $infile | awk '{print \"23\", \$11}' >> $dirname/q_time_p.data"; -system "grep 'PERF1.POWER.RF2 ' $infile | awk '{print \"24\", \$11}' >> $dirname/q_time_p.data"; +unless ($no_refresh) { + system "grep 'PERF1.POWER.RF1 ' $infile | awk '{print \"23\", \$11}' >> $dirname/q_time_p.data"; + system "grep 'PERF1.POWER.RF2 ' $infile | awk '{print \"24\", \$11}' >> $dirname/q_time_p.data"; + } # Generate data file of average throughput query times. @@ -167,19 +171,21 @@ $avg = average(); system "echo 22.1 $avg >> $dirname/q_time_t.data"; -$raw_data = `grep THRUPUT $infile | grep 'RF1 ' | awk '{print \$11}' | xargs`; -@data = split ' ', $raw_data; -$avg = average(); -system "echo 23.1 $avg >> $dirname/q_time_t.data"; +unless ($no_refresh) { + $raw_data = `grep THRUPUT $infile | grep 'RF1 ' | awk '{print \$11}' | xargs`; + @data = split ' ', $raw_data; + $avg = average(); + system "echo 23.1 $avg >> $dirname/q_time_t.data"; -$raw_data = `grep THRUPUT $infile | grep 'RF2 ' | awk '{print \$11}' | xargs`; -@data = split ' ', $raw_data; -$avg = average(); -system "echo 24.1 $avg >> $dirname/q_time_t.data"; + $raw_data = `grep THRUPUT $infile | grep 'RF2 ' | awk '{print \$11}' | xargs`; + @data = split ' ', $raw_data; + $avg = average(); + system "echo 24.1 $avg >> $dirname/q_time_t.data"; +} my $outfile = new FileHandle; unless( $outfile->open( "> $dirname/q_time.input" ) ) { - die "cannot open $dirname/q_time.input $!"; + die "cannot open $dirname/q_time.input $!"; } print $outfile "set style line 1 lt 1 lw 50\n"; @@ -187,7 +193,11 @@ print $outfile "plot \"q_time_p.data\" using 1:2 title \"Power\" with imp ls 1, \"q_time_t.data\" using 1:2 title \"Throughput\" with imp ls 2\n"; print $outfile "set term png small\n"; print $outfile "set output \"q_time.png\"\n"; -print $outfile "set xtics \(\"Q1\" 1, \"Q2\" 2, \"Q3\" 3, \"Q4\" 4, \"Q5\" 5, \"Q6\" 6, \"Q7\" 7, \"Q8\" 8, \"Q9\" 9, \"Q10\" 10, \"Q11\" 11, \"Q12\" 12, \"Q13\" 13, \"Q14\" 14, \"Q15\" 15, \"Q16\" 16, \"Q17\" 17, \"Q18\" 18, \"Q19\" 19, \"Q20\" 20, \"Q21\" 21, \"Q22\" 22, \"RF1\" 23, \"RF2\" 24\)\n"; +if ($no_refresh) { +print $outfile "set xtics \(\"Q1\" 1, \"Q2\" 2, \"Q3\" 3, \"Q4\" 4, \"Q5\" 5, \"Q6\" 6, \"Q7\" 7, \"Q8\" 8, \"Q9\" 9, \"Q10\" 10, \"Q11\" 11, \"Q12\" 12, \"Q13\" 13, \"Q14\" 14, \"Q15\" 15, \"Q16\" 16, \"Q17\" 17, \"Q18\" 18, \"Q19\" 19, \"Q20\" 20, \"Q21\" 21, \"Q22\" 22\)\n"; +} else { + print $outfile "set xtics \(\"Q1\" 1, \"Q2\" 2, \"Q3\" 3, \"Q4\" 4, \"Q5\" 5, \"Q6\" 6, \"Q7\" 7, \"Q8\" 8, \"Q9\" 9, \"Q10\" 10, \"Q11\" 11, \"Q12\" 12, \"Q13\" 13, \"Q14\" 14, \"Q15\" 15, \"Q16\" 16, \"Q17\" 17, \"Q18\" 18, \"Q19\" 19, \"Q20\" 20, \"Q21\" 21, \"Q22\" 22, \"RF1\" 23, \"RF2\" 24\)\n"; +} print $outfile "set ylabel \"Query Time in Seconds\"\n"; print $outfile "set xrange [0:25]\n"; print $outfile "replot\n"; Modified: trunk/dbt3/scripts/pgsql/get_power.sh =================================================================== --- trunk/dbt3/scripts/pgsql/get_power.sh 2006-08-11 04:10:13 UTC (rev 1448) +++ trunk/dbt3/scripts/pgsql/get_power.sh 2006-08-11 19:50:55 UTC (rev 1449) @@ -18,7 +18,8 @@ echo "usage: get_power.sh -i <q_time.out> -p <perfrun> -s <scale factor> [-v]" } -while getopts "i:p:s:v" OPT; do +NO_REFRESH=0 +while getopts "i:p:s:vz" OPT; do case ${OPT} in i) INFILE=${OPTARG} @@ -33,6 +34,9 @@ set -x SHELL="${SHELL} +x" ;; + z) + NO_REFRESH=1 + ;; esac done @@ -53,23 +57,25 @@ VALUES="${VALUES} ${VAL}" done -# -# Get execution time for the each of the refresh functions. -# -for i in `seq 1 2`; do - VAL=`grep "PERF${PERFNUM}.POWER.RF${i}" ${INFILE} | awk '{ print $11 }'` - if [ -z ${VAL} ]; then - echo "No power data retrieved for 'PERF${PERFNUM}.POWER.RF${i}'." - exit 1 - fi +if [ ${NO_REFRESH} -eq 0 ]; then # - # in case the refresh functions finished within 1 second + # Get execution time for the each of the refresh functions. # - if [ "x${VAL}" = "x0" ]; then - VAL=1 - fi - VALUES="${VALUES} ${VAL}" -done + for i in `seq 1 2`; do + VAL=`grep "PERF${PERFNUM}.POWER.RF${i}" ${INFILE} | awk '{ print $11 }'` + if [ -z ${VAL} ]; then + echo "No power data retrieved for 'PERF${PERFNUM}.POWER.RF${i}'." + exit 1 + fi + # + # in case the refresh functions finished within 1 second + # + if [ "x${VAL}" = "x0" ]; then + VAL=1 + fi + VALUES="${VALUES} ${VAL}" + done +fi ${POWER} ${SCALE_FACTOR} ${VALUES} || exit 1 Modified: trunk/dbt3/scripts/pgsql/power_test.sh.in =================================================================== --- trunk/dbt3/scripts/pgsql/power_test.sh.in 2006-08-11 04:10:13 UTC (rev 1448) +++ trunk/dbt3/scripts/pgsql/power_test.sh.in 2006-08-11 19:50:55 UTC (rev 1449) @@ -45,9 +45,10 @@ EXPLAIN_ANALYZE=0 USE_OPROFILE=0 +NO_REFRESH=0 # process the command line parameters -while getopts "ef:p:o:s:t:y" opt; do +while getopts "ef:p:o:s:t:yz" opt; do case $opt in e) EXPLAIN_ANALYZE=1 ;; @@ -64,6 +65,8 @@ ;; y) USE_OPROFILE=1 ;; + z) NO_REFRESH=1 + ;; ?) echo "Usage: $0 -f <SCALE_FACTOR> [-e -p <db_params> -t <tag> -y]" exit ;; esac @@ -122,28 +125,32 @@ s_time_power=`$GTIME` ${SHELL} $DBSCRIPTDIR/record_start.sh -n "PERF${TAG}.POWER" || exit 1 -# Refresh Stream 1 -echo "`date`: Power Test : Starting Refresh Stream 1" -s_time=`$GTIME` -${SHELL} $DBSCRIPTDIR/record_start.sh -n "PERF${TAG}.POWER.RF1" || exit 1 -${SHELL} $DBSCRIPTDIR/run_rf1.sh $SCALE_FACTOR $RUNDIR > $OUTPUT_DIR/results/power.perf${TAG}.rf1.result 2>&1 || exit 1 -${SHELL} $DBSCRIPTDIR/record_end.sh -n "PERF${TAG}.POWER.RF1" || exit 1 -e_time=`$GTIME` -echo "`date`: Power Test : Refresh Stream 1 completed." -let "diff_time=$e_time-$s_time" +if [ ${NO_REFRESH} -eq 0 ]; then + # Refresh Stream 1 + echo "`date`: Power Test : Starting Refresh Stream 1" + s_time=`$GTIME` + ${SHELL} $DBSCRIPTDIR/record_start.sh -n "PERF${TAG}.POWER.RF1" || exit 1 + ${SHELL} $DBSCRIPTDIR/run_rf1.sh $SCALE_FACTOR $RUNDIR > $OUTPUT_DIR/results/power.perf${TAG}.rf1.result 2>&1 || exit 1 + ${SHELL} $DBSCRIPTDIR/record_end.sh -n "PERF${TAG}.POWER.RF1" || exit 1 + e_time=`$GTIME` + echo "`date`: Power Test : Refresh Stream 1 completed." + let "diff_time=$e_time-$s_time" +fi # Execute the queries. ${SHELL} $DBSCRIPTDIR/run_power_query.sh $SCALE_FACTOR $TAG $EXPLAIN_ANALYZE $OUTPUT_DIR $RUNDIR $SEED_FILE || exit 1 -# Refresh Stream 2 -echo "`date`: Power Test : Starting Refresh Stream 2" -s_time=`$GTIME` -${SHELL} $DBSCRIPTDIR/record_start.sh -n "PERF${TAG}.POWER.RF2" || exit 1 -${SHELL} $DBSCRIPTDIR/run_rf2.sh $RUNDIR > $OUTPUT_DIR/results/power.perf${TAG}.rf2.result 2>&1 || exit 1 -${SHELL} $DBSCRIPTDIR/record_end.sh -n "PERF${TAG}.POWER.RF2" || exit 1 -e_time=`$GTIME` -echo "`date`: Power Test : Refresh Stream 2 completed." -let "diff_time=$e_time-$s_time" +if [ ${NO_REFRESH} -eq 0 ]; then + # Refresh Stream 2 + echo "`date`: Power Test : Starting Refresh Stream 2" + s_time=`$GTIME` + ${SHELL} $DBSCRIPTDIR/record_start.sh -n "PERF${TAG}.POWER.RF2" || exit 1 + ${SHELL} $DBSCRIPTDIR/run_rf2.sh $RUNDIR > $OUTPUT_DIR/results/power.perf${TAG}.rf2.result 2>&1 || exit 1 + ${SHELL} $DBSCRIPTDIR/record_end.sh -n "PERF${TAG}.POWER.RF2" || exit 1 + e_time=`$GTIME` + echo "`date`: Power Test : Refresh Stream 2 completed." + let "diff_time=$e_time-$s_time" +fi ${SHELL} $DBSCRIPTDIR/record_end.sh -n "PERF${TAG}.POWER" || exit 1 e_time_power=`$GTIME` Modified: trunk/dbt3/scripts/pgsql/throughput_stream_wrapper.sh.in =================================================================== --- trunk/dbt3/scripts/pgsql/throughput_stream_wrapper.sh.in 2006-08-11 04:10:13 UTC (rev 1448) +++ trunk/dbt3/scripts/pgsql/throughput_stream_wrapper.sh.in 2006-08-11 19:50:55 UTC (rev 1449) @@ -10,7 +10,8 @@ SRCDIR=@TOPDIR@ EXPLAIN_ANALYZE=0 -while getopts "ef:n:o:s:t:" opt; do +NO_REFRESH=0 +while getopts "ef:n:o:s:t:z" opt; do case $opt in e) EXPLAIN_ANALYZE=1 ;; @@ -24,6 +25,8 @@ ;; t) TAG=$OPTARG ;; + z) NO_REFRESH=1 + ;; esac done @@ -40,40 +43,39 @@ let "i=$i+1" done -# Start the refresh stream. The throughput tests runs a streams consecutively -# per throughput streams, also consecutively. -stream_num=1 -while [ $stream_num -le $num_stream ] -do -# s_time_stream=`$GTIME` - bash $DBSCRIPTDIR/record_start.sh -n "PERF${TAG}.THRUPUT.RFST${stream_num}" +if [ ${NO_REFRESH} -eq 0 ]; then + # Start the refresh stream. The throughput tests runs a streams + # consecutively per throughput streams, also consecutively. + stream_num=1 + while [ $stream_num -le $num_stream ] + do + bash $DBSCRIPTDIR/record_start.sh -n "PERF${TAG}.THRUPUT.RFST${stream_num}" - echo "`date`: Throughput Stream $stream_num : Starting Refresh Stream 1..." - s_time_rf1=`$GTIME` - bash $DBSCRIPTDIR/record_start.sh -n "PERF${TAG}.THRUPUT.RFST${stream_num}.RF1" - bash $DBSCRIPTDIR/run_rf1.sh $scale_factor $RUNDIR > $OUTPUT_DIR/results/thruput.perf${TAG}.stream${stream_num}.rf1.result 2>&1 || exit 1 - bash $DBSCRIPTDIR/record_end.sh -n "PERF${TAG}.THRUPUT.RFST${stream_num}.RF1" - e_time_rf1=`$GTIME` - echo "`date`: Throughput Stream $stream_num : Refresh Stream 1 completed." - let "diff_time_rf1=$e_time_rf1-$s_time_rf1" - echo "Throughput Stream $stream_num : Elapsed time for Refresh Stream 1 : $diff_time_rf1 seconds" + echo "`date`: Throughput Stream $stream_num : Starting Refresh Stream 1..." + s_time_rf1=`$GTIME` + bash $DBSCRIPTDIR/record_start.sh -n "PERF${TAG}.THRUPUT.RFST${stream_num}.RF1" + bash $DBSCRIPTDIR/run_rf1.sh $scale_factor $RUNDIR > $OUTPUT_DIR/results/thruput.perf${TAG}.stream${stream_num}.rf1.result 2>&1 || exit 1 + bash $DBSCRIPTDIR/record_end.sh -n "PERF${TAG}.THRUPUT.RFST${stream_num}.RF1" + e_time_rf1=`$GTIME` + echo "`date`: Throughput Stream $stream_num : Refresh Stream 1 completed." + let "diff_time_rf1=$e_time_rf1-$s_time_rf1" + echo "Throughput Stream $stream_num : Elapsed time for Refresh Stream 1 : $diff_time_rf1 seconds" - echo "`date`: Throughput Stream $stream_num : Starting Refresh Stream 2..." - s_time_rf2=`$GTIME` - bash $DBSCRIPTDIR/record_start.sh -n "PERF${TAG}.THRUPUT.RFST${stream_num}.RF2" - bash $DBSCRIPTDIR/run_rf2.sh $RUNDIR > $OUTPUT_DIR/results/thruput.perf${TAG}.stream${stream_num}.rf2.result 2>&1 || exit 1 - bash $DBSCRIPTDIR/record_end.sh -n "PERF${TAG}.THRUPUT.RFST${stream_num}.RF2" - e_time_rf2=`$GTIME` - echo "`date`: Throughput Stream $stream_num : Refresh Stream 2 completed." - let "diff_time_rf2=$e_time_rf2-$s_time_rf2" - echo "Throughput Stream $stream_num : Elapsed time for Refresh Stream 2 : $diff_time_rf2 seconds" + echo "`date`: Throughput Stream $stream_num : Starting Refresh Stream 2..." + s_time_rf2=`$GTIME` + bash $DBSCRIPTDIR/record_start.sh -n "PERF${TAG}.THRUPUT.RFST${stream_num}.RF2" + bash $DBSCRIPTDIR/run_rf2.sh $RUNDIR > $OUTPUT_DIR/results/thruput.perf${TAG}.stream${stream_num}.rf2.result 2>&1 || exit 1 + bash $DBSCRIPTDIR/record_end.sh -n "PERF${TAG}.THRUPUT.RFST${stream_num}.RF2" + e_time_rf2=`$GTIME` + echo "`date`: Throughput Stream $stream_num : Refresh Stream 2 completed." + let "diff_time_rf2=$e_time_rf2-$s_time_rf2" + echo "Throughput Stream $stream_num : Elapsed time for Refresh Stream 2 : $diff_time_rf2 seconds" - bash $DBSCRIPTDIR/record_end.sh -n "PERF${TAG}.THRUPUT.RFST${stream_num}" -# e_time_stream=`$GTIME` -# let "diff_time_stream=$e_time_stream-$s_time_stream" + bash $DBSCRIPTDIR/record_end.sh -n "PERF${TAG}.THRUPUT.RFST${stream_num}" - let "stream_num=$stream_num+1" -done + let "stream_num=$stream_num+1" + done +fi wait Modified: trunk/dbt3/scripts/pgsql/throughput_test.sh.in =================================================================== --- trunk/dbt3/scripts/pgsql/throughput_test.sh.in 2006-08-11 04:10:13 UTC (rev 1448) +++ trunk/dbt3/scripts/pgsql/throughput_test.sh.in 2006-08-11 19:50:55 UTC (rev 1449) @@ -52,8 +52,9 @@ } TEST_ARGS= +NO_REFRESH_FLAG= -while getopts "ef:n:o:p:s:t:y" opt; do +while getopts "ef:n:o:p:s:t:yz" opt; do case $opt in e) TEST_ARGS="$TEST_ARGS -e" ;; @@ -72,6 +73,8 @@ ;; y) USE_OPROFILE=1 ;; + z) NO_REFRESH_FLAG="-z" + ;; esac done @@ -109,7 +112,7 @@ ${SHELL} $DBSTATS $SID $OUTPUT_DIR & # Start the streams. -${SHELL} $DBSCRIPTDIR/throughput_stream_wrapper.sh -f $scale_factor -t $TAG -n $num_stream $TEST_ARGS -o $OUTPUT_DIR -s ${SEED_FILE} || exit 1 +${SHELL} $DBSCRIPTDIR/throughput_stream_wrapper.sh -f $scale_factor -t $TAG -n $num_stream $TEST_ARGS -o $OUTPUT_DIR -s ${SEED_FILE} ${NO_REFRESH_FLAG} || exit 1 # Stop collecting system statistics. ${SHELL} $SRCDIR/scripts/stop_sysstats.sh $OUTPUT_DIR || exit 1 Modified: trunk/dbt3/scripts/run_workload.sh.in =================================================================== --- trunk/dbt3/scripts/run_workload.sh.in 2006-08-11 04:10:13 UTC (rev 1448) +++ trunk/dbt3/scripts/run_workload.sh.in 2006-08-11 19:50:55 UTC (rev 1449) @@ -25,10 +25,10 @@ GENERATE=0 TEST_ARGS= LOAD_ARGS= -while getopts "ef:gn:op:q:r:s:tuv" opt; do +while getopts "ef:gn:op:q:r:s:tuvz" opt; do case $opt in e) - # PostgreSQL only. + # PostgreSQL only: EXPLAIN ANALIZE. TEST_ARGS="$TEST_ARGS -e" ;; f) @@ -68,6 +68,9 @@ SHELL="${SHELL} -x" export SHELL; ;; + z) + NO_REFRESH_FLAG="-z" + ;; esac done @@ -104,10 +107,10 @@ ${SHELL} $DBSCRIPTDIR/record_start.sh -n "PERF${i}" || exit 1 # Power Test - ${SHELL} $DBSCRIPTDIR/power_test.sh -f $SCALE_FACTOR -o $OUTPUT_DIR/power${i} -p "${POWER_PARAMETERS}" $TEST_ARGS -s ${SEED_FILE} -t $i ${OPROFILE_FLAG} || exit 1 + ${SHELL} $DBSCRIPTDIR/power_test.sh -f $SCALE_FACTOR -o $OUTPUT_DIR/power${i} -p "${POWER_PARAMETERS}" $TEST_ARGS -s ${SEED_FILE} -t $i ${OPROFILE_FLAG} ${NO_REFRESH_FLAG} || exit 1 # Throughput Test - ${SHELL} $DBSCRIPTDIR/throughput_test.sh -n $STREAMS -f $SCALE_FACTOR -o $OUTPUT_DIR/throughput${i} -p "${THROUGHPUT_PARAMETERS}" $TEST_ARGS -s ${SEED_FILE} -t $i ${OPROFILE_FLAG} || exit 1 + ${SHELL} $DBSCRIPTDIR/throughput_test.sh -n $STREAMS -f $SCALE_FACTOR -o $OUTPUT_DIR/throughput${i} -p "${THROUGHPUT_PARAMETERS}" $TEST_ARGS -s ${SEED_FILE} -t $i ${OPROFILE_FLAG} ${NO_REFRESH_FLAG} || exit 1 # The database should be shut down after the last test, so start it back # up so we can update and retrieve test information in the database. @@ -130,10 +133,14 @@ ${SHELL} $DBSCRIPTDIR/q_time.sh > $OUTPUT_DIR/q_time.out || exit 1 # Calculate composite score. -${SHELL} $SRCDIR/scripts/get_composite.sh -i ${OUTPUT_DIR}/q_time.out -p 1 \ - -s ${SCALE_FACTOR} -n ${STREAMS} \ - -o ${OUTPUT_DIR}/calc_composite.out || exit 1 -perl $SRCDIR/scripts/graph_query_time.pl --if $OUTPUT_DIR/q_time.out || exit 1 +${SHELL} $SRCDIR/scripts/get_composite.sh \ + -i ${OUTPUT_DIR}/q_time.out \ + -p 1 \ + -s ${SCALE_FACTOR} \ + -n ${STREAMS} \ + -o ${OUTPUT_DIR}/calc_composite.out \ + ${NO_REFRESH_FLAG} || exit 1 +perl $SRCDIR/scripts/graph_query_time.pl --if $OUTPUT_DIR/q_time.out ${NO_REFRESH_FLAG} || exit 1 ${SHELL} $SRCDIR/scripts/gen_html.sh $OUTPUT_DIR > $OUTPUT_DIR/index.html || exit 1 RUN_NUMBER=`expr $RUN_NUMBER + 1` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |