From 2a6bdb2ebbec211fd16730983491a37575f855d8 Mon Sep 17 00:00:00 2001
From: Michael Vrable <mvrable@cs.ucsd.edu>
Date: Thu, 10 Mar 2011 14:38:44 -0800
Subject: [PATCH] Update some benchmark-running scripts

---
 microbench/run2.sh          | 7 ++++---
 microbench/setup/run-proxy  | 9 +++++++--
 microbench/setup/stop-proxy | 1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/microbench/run2.sh b/microbench/run2.sh
index b6af7fd..aaab88f 100755
--- a/microbench/run2.sh
+++ b/microbench/run2.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 
-PARAMS="BLUESKY_CACHE_SIZE BLUESKY_TARGET BENCH_DURATION BENCH_FILESIZE BENCH_FILECOUNT BENCH_WRITERATIO BENCH_THREADS BENCH_OPS BENCH_INTERVALS BENCH_DIRSIZE BENCH_BLOCKSIZE NFS_BLOCKSIZE"
+PARAMS="BLUESKY_RUN_NAME BLUESKY_CACHE_SIZE BLUESKY_TARGET BENCH_DURATION BENCH_FILESIZE BENCH_FILECOUNT BENCH_WRITERATIO BENCH_THREADS BENCH_OPS BENCH_INTERVALS BENCH_DIRSIZE BENCH_BLOCKSIZE NFS_BLOCKSIZE"
 
+BLUESKY_RUN_NAME=$(date +%Y%m%d)-$$
 BENCHER=c09-44.sysnet.ucsd.edu
 PROXY=c09-45.sysnet.ucsd.edu
 
-SSH_ARGS=""
+SSH_ARGS="-i $HOME/.ssh/id_bluesky"
 
 get_params() {
     for p in $PARAMS; do
@@ -22,7 +23,7 @@ run_cmd() {
     ssh $SSH_ARGS -l root $host /scratch/bluesky.git/microbench/setup/$cmd "$@" $(get_params)
 }
 
-BLUESKY_CACHE_SIZE=$((512 * 1024))
+BLUESKY_CACHE_SIZE=$((8 * 1024 * 1024))
 BENCH_FILESIZE=$((1024 * 1024))
 BENCH_BLOCKSIZE=0
 BENCH_FILECOUNT=$((62))
diff --git a/microbench/setup/run-proxy b/microbench/setup/run-proxy
index c3013c7..94a8e46 100755
--- a/microbench/setup/run-proxy
+++ b/microbench/setup/run-proxy
@@ -4,9 +4,10 @@
 
 # Defaults
 . /scratch/aws-keys
-export BLUESKY_CACHE_SIZE=$((512 * 1024))
+export BLUESKY_RUN_NAME=$(date +%Y%m%d)-$$
+export BLUESKY_CACHE_SIZE=$((8 * 1024 * 1024))
 export BLUESKY_TARGET=s3
-export BLUESKY_PROFILE_OUT=/export2/profile.txt
+#export BLUESKY_PROFILE_OUT=/export2/profile.txt
 
 # Export any environment variables specified on the command line
 for e in "$@"; do
@@ -17,6 +18,10 @@ for e in "$@"; do
     fi
 done
 
+# Track system performance counter data
+export BLUESKY_STATS_OUT=/export2/$BLUESKY_RUN_NAME.stats
+/usr/lib/atsar/atsadc 5 17280 /export2/$BLUESKY_RUN_NAME.sadc
+
 if [ "$BLUESKY_TARGET" = "native" ]; then
     /etc/init.d/nfs-kernel-server start
 else
diff --git a/microbench/setup/stop-proxy b/microbench/setup/stop-proxy
index 482a7e4..2e3582d 100755
--- a/microbench/setup/stop-proxy
+++ b/microbench/setup/stop-proxy
@@ -14,4 +14,5 @@ if [ "$BLUESKY_TARGET" = "native" ]; then
     /etc/init.d/nfs-kernel-server stop
 else
     pkill -INT nfsproxy
+    pkill -TERM atsadc
 fi
-- 
2.20.1