Split benchmark file system setup and execution into separate steps.

[bluesky.git] / microbench / run2.sh

diff --git a/microbench/run2.sh b/microbench/run2.sh
index 3bcc2e5..24f4348 100755 (executable)
--- a/microbench/run2.sh
+++ b/microbench/run2.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PARAMS="BLUESKY_CACHE_SIZE BLUESKY_TARGET BENCH_DURATION BENCH_FILESIZE BENCH_FILECOUNT BENCH_WRITERATIO BENCH_THREADS BENCH_OPS"
+PARAMS="BLUESKY_CACHE_SIZE BLUESKY_TARGET BENCH_DURATION BENCH_FILESIZE BENCH_FILECOUNT BENCH_WRITERATIO BENCH_THREADS BENCH_OPS BENCH_INTERVALS"
 
 BENCHER=c09-44.sysnet.ucsd.edu
 PROXY=c09-45.sysnet.ucsd.edu
@@ -16,7 +16,7 @@ get_params() {
 run_cmd() {
     host="$1"; shift
     cmd="$1"; shift
-    echo "EXECUTE($host):" "$cmd" "$@"
+    echo "EXECUTE($host):" "$cmd" "$@" 1>&2
     ssh -l root $host /scratch/bluesky.git/microbench/setup/$cmd "$@" $(get_params)
 }
 
@@ -35,6 +35,7 @@ for size in 512; do
     run_cmd $PROXY run-proxy >$PREFIX.proxy 2>&1 &
     proxy_pid=$!
     sleep 10
+    run_cmd $BENCHER prepare-benchmark
     run_cmd $BENCHER run-benchmark | tee $PREFIX.results
     run_cmd $PROXY stop-proxy
     echo "Waiting for proxy to stop..."