From 3a63041232b22ef44618ceb4d34122c17af69214 Mon Sep 17 00:00:00 2001
From: Michael Vrable <mvrable@cs.ucsd.edu>
Date: Wed, 16 Mar 2011 13:39:49 -0700
Subject: [PATCH] Benchmark setup

---
 microbench/run-synread.sh       | 11 ++++++-----
 microbench/setup/warmup-synread |  2 +-
 nfs3/synreadbench.c             |  1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/microbench/run-synread.sh b/microbench/run-synread.sh
index a6e5181..c6ae3d3 100755
--- a/microbench/run-synread.sh
+++ b/microbench/run-synread.sh
@@ -6,8 +6,7 @@ BASEDIR=$(dirname $(which $0))
 BLUESKY_TARGET=s3:mvrable-readbench-west
 BLUESKY_EXTRA_OPTS="BLUESKY_OPT_NO_CRYPTO=1"
 
-sizes="1048576"
-#sizes="1048576 131072 32768"
+sizes="1048576 131072 32768"
 
 run_synbench() {
     basename=$(date +%Y%m%d)-$1
@@ -18,10 +17,12 @@ run_synbench() {
     proxy_pid=$!
     sleep 10
 
-    SYNREAD_SIZE=1048576
+    SYNREAD_SIZE=$((1 << 24))
     run_cmd $BENCHER warmup-synread
     for s in $sizes; do
         SYNREAD_SIZE=$s
+        SYNREAD_OUTSTANDING=8
+        SYNREAD_PROCS=16
         BLUESKY_RUN_NAME=$basename-$s
         run_cmd $BENCHER run-synread
     done
@@ -31,9 +32,9 @@ run_synbench() {
     wait $proxy_pid
 }
 
+SYNREAD_DURATION=60
 for BLUESKY_CACHE_SIZE in $((256 * 1024)) $((8192 * 1024 * 1024)); do
-    echo
+    run_synbench "syntest-$((BLUESKY_CACHE_SIZE / 1024))"
 done
 
 BLUESKY_CACHE_SIZE=$((256 * 1024))
-run_synbench syntest
diff --git a/microbench/setup/warmup-synread b/microbench/setup/warmup-synread
index 5a346ae..d412637 100755
--- a/microbench/setup/warmup-synread
+++ b/microbench/setup/warmup-synread
@@ -16,4 +16,4 @@ for e in "$@"; do
     fi
 done
 
-/scratch/bluesky.git/nfs3/synreadbench /scratch/inodes.txt $SYNREAD_OUTSTANDING $SYNREAD_SIZE WARMUP
+/scratch/bluesky.git/nfs3/synreadbench /scratch/inodes.txt 64 $SYNREAD_SIZE WARMUP
diff --git a/nfs3/synreadbench.c b/nfs3/synreadbench.c
index b055e01..1e749fa 100644
--- a/nfs3/synreadbench.c
+++ b/nfs3/synreadbench.c
@@ -443,7 +443,6 @@ int main(int argc, char *argv[])
 {
     g_thread_init(NULL);
     g_set_prgname("synclient");
-    g_print("Launching synthetic NFS RPC client...\n");
 
     bench_files = g_array_new(FALSE, TRUE, sizeof(struct bench_file));
 
-- 
2.20.1