Add proper per-file copyright notices/licenses and top-level license.

[bluesky.git] / microbench / run2.sh

diff --git a/microbench/run2.sh b/microbench/run2.sh
index 6090129..75b61de 100755 (executable)
--- a/microbench/run2.sh
+++ b/microbench/run2.sh
@@ -3,12 +3,15 @@
 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
 
+    BLUESKY_RUN_NAME=$PREFIX
     $HOME/bin/s3-cleanup.py mvrable-bluesky
     $HOME/bin/s3-cleanup.py mvrable-bluesky-west
     run_cmd $PROXY cleanup-proxy
@@ -19,9 +22,10 @@ run_one() {
 
     for BENCH_OPS in $ops_list; do
         sleep 10
+        BLUESKY_RUN_NAME=$PREFIX-$BENCH_OPS
         echo "SETTINGS:" $(get_params)
-        get_params >$PREFIX-$BENCH_OPS.settings
-        run_cmd $BENCHER run-benchmark | tee $PREFIX-$BENCH_OPS.results
+        get_params >$BLUESKY_RUN_NAME.settings
+        (date; run_cmd $BENCHER run-benchmark) | tee $BLUESKY_RUN_NAME.results
     done
 
     run_cmd $PROXY stop-proxy
@@ -29,17 +33,17 @@ 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
-    run_one $BLUESKY_TARGET-$BENCH_WRITERATIO-${size}M-32k
+    NFS_BLOCKSIZE=32768
+    run_one s3-$BENCH_WRITERATIO-${size}M-32k
 
     BENCH_BLOCKSIZE=0
-    run_one $BLUESKY_TARGET-$BENCH_WRITERATIO-${size}M-1024k
+    NFS_BLOCKSIZE=1048576
+    run_one s3-$BENCH_WRITERATIO-${size}M-1024k
 done
 }