From 31e56a56ba48da0a08832fda54a98a381e1d6df8 Mon Sep 17 00:00:00 2001
From: Michael Vrable <mvrable@cs.ucsd.edu>
Date: Thu, 10 Mar 2011 20:23:47 -0800
Subject: [PATCH] Prepare for microbench re-run with latest code

---
 microbench/run2.sh             | 10 ++++++----
 microbench/setup/run-benchmark |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/microbench/run2.sh b/microbench/run2.sh
index 6090129..7148f6c 100755
--- a/microbench/run2.sh
+++ b/microbench/run2.sh
@@ -3,8 +3,10 @@
 BASEDIR=$(dirname $(which $0))
 . $BASEDIR/run-common.sh
 
+BLUESKY_CACHE_SIZE=$((1024 * 1024))
+
 sizes="128 512 1024 2048 8192"
-ops_list="2000 1000 500 200 100 50 20 10"
+ops_list="1000 500 200 100 50 20 10"
 
 run_one() {
     PREFIX=$1
@@ -21,7 +23,7 @@ run_one() {
         sleep 10
         echo "SETTINGS:" $(get_params)
         get_params >$PREFIX-$BENCH_OPS.settings
-        run_cmd $BENCHER run-benchmark | tee $PREFIX-$BENCH_OPS.results
+        (date; run_cmd $BENCHER run-benchmark) | tee $PREFIX-$BENCH_OPS.results
     done
 
     run_cmd $PROXY stop-proxy
@@ -29,16 +31,16 @@ run_one() {
     wait $proxy_pid
 }
 
-#for size in 128 256 512 768 1024 1536 2048; do
-#    for filesize in 4 32 256 2048; do
 run_experiments() {
 for size in $sizes; do
     BENCH_FILECOUNT=$(($size * 1024 / ($BENCH_FILESIZE / 1024)))
 
     BENCH_BLOCKSIZE=32768
+    NFS_BLOCKSIZE=32768
     run_one $BLUESKY_TARGET-$BENCH_WRITERATIO-${size}M-32k
 
     BENCH_BLOCKSIZE=0
+    NFS_BLOCKSIZE=1048576
     run_one $BLUESKY_TARGET-$BENCH_WRITERATIO-${size}M-1024k
 done
 }
diff --git a/microbench/setup/run-benchmark b/microbench/setup/run-benchmark
index d97854c..b38ca8d 100755
--- a/microbench/setup/run-benchmark
+++ b/microbench/setup/run-benchmark
@@ -4,7 +4,7 @@
 
 
 # Defaults
-SERVER=c09-45.sysnet.ucsd.edu
+SERVER=vrable2.sysnet.ucsd.edu
 MNTDIR=/mnt/bluesky
 
 BENCH_FILESIZE=$((1 << 12))
-- 
2.20.1