From 98ef21169a7357117758494e6ed05ec659edc29a Mon Sep 17 00:00:00 2001
From: Michael Vrable <mvrable@cs.ucsd.edu>
Date: Tue, 15 Mar 2011 17:15:15 -0700
Subject: [PATCH] Minor changes to graphs and benchmark control scripts

---
 microbench/run-spec.sh          | 16 ++++++++++++----
 results/figures/specsfs.gnuplot | 23 ++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/microbench/run-spec.sh b/microbench/run-spec.sh
index bd2ab63..66bc40e 100755
--- a/microbench/run-spec.sh
+++ b/microbench/run-spec.sh
@@ -7,8 +7,8 @@ run_spec() {
     BLUESKY_RUN_NAME=$(date +%Y%m%d)-$1
     SPEC_CONF=$2
 
-    #$HOME/bin/s3-cleanup.py mvrable-bluesky
-    #$HOME/bin/s3-cleanup.py mvrable-bluesky-west
+    $HOME/bin/s3-cleanup.py mvrable-bluesky
+    $HOME/bin/s3-cleanup.py mvrable-bluesky-west
     run_cmd $PROXY cleanup-proxy
     run_cmd $PROXY run-proxy >$BLUESKY_RUN_NAME.proxy 2>&1 &
     proxy_pid=$!
@@ -32,5 +32,13 @@ run_spec() {
 #run_spec s3-west-noseg sfs_bluesky
 
 # Standard test with Azure instead of Amazon S3 for storage
-BLUESKY_TARGET=azure
-run_spec azure sfs_bluesky
+#BLUESKY_TARGET=azure
+#run_spec azure sfs_bluesky
+
+# BlueSky, testing with a greater degree of parallelism
+BLUESKY_TARGET=s3:mvrable-bluesky-west
+BLUESKY_EXTRA_OPTS="BLUESKY_OPT_NO_CRYPTO=1"
+run_spec s3-west-hi8-fixedsize sfs_bluesky-hi
+
+#BLUESKY_TARGET=native
+#run_spec native-hi8 sfs_bluesky-hi
diff --git a/results/figures/specsfs.gnuplot b/results/figures/specsfs.gnuplot
index 9606f98..0869963 100644
--- a/results/figures/specsfs.gnuplot
+++ b/results/figures/specsfs.gnuplot
@@ -13,7 +13,7 @@ set xtics nomirror
 set x2tics auto
 
 set grid
-set key top right
+set key top left
 
 set output "spec1.eps"
 set ylabel "Achieved Operations per Second"
@@ -35,3 +35,24 @@ plot "../20110311/sfssum.20110312-native" using 1:3 with linespoints title "Loca
      "../20110311/sfssum.20110312-s3-west-fullseg" using 1:3 with linespoints title "BlueSky (full fetches)", \
      "../20110311/sfssum.20110312-s3-west-noseg" using 1:3 with linespoints title "BlueSky (no segments)", \
      "../20110311/sfssum.20110313-azure" using 1:3 with linespoints title "Azure"
+
+XMAX=1600
+set xrange [0:XMAX]
+set x2range [0:XMAX*OPS_WSS_SCALE]
+set xtics nomirror
+set x2tics auto
+set yrange [*:*]
+
+set output "spec-parallel1.eps"
+set ylabel "Achieved Operations per Second"
+plot "../20110311/sfssum.20110312-native" with linespoints title "Local NFS Server", \
+     "../20110311/sfssum.20110315-native-hi8" with linespoints title "Local (8 clients)", \
+     "../20110311/sfssum.20110311-s3-west" with linespoints title "BlueSky", \
+     "../20110311/sfssum.20110314-s3-west-hi8" with linespoints title "BlueSky (8 clients)"
+
+set output "spec-parallel2.eps"
+set ylabel "Operation Latency (ms)"
+plot "../20110311/sfssum.20110312-native" using 1:3 with linespoints title "Local NFS Server", \
+     "../20110311/sfssum.20110315-native-hi8" using 1:3 with linespoints title "Local (8 clients)", \
+     "../20110311/sfssum.20110311-s3-west" using 1:3 with linespoints title "BlueSky", \
+     "../20110311/sfssum.20110314-s3-west-hi8" using 1:3 with linespoints title "BlueSky (8 clients)"
-- 
2.20.1