X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=microbench%2Fsetup%2Frun-benchmark;h=b38ca8da89aaf03c787526b7e0a1b813b9c35a69;hb=edc8e63804c4c1065f3224e829b711c75330072d;hp=4b590e311853c80778747975afb09bd2afc3ba04;hpb=30cb3aacb8d70657d27af5956a482f0f653a457c;p=bluesky.git

diff --git a/microbench/setup/run-benchmark b/microbench/setup/run-benchmark
index 4b590e3..b38ca8d 100755
--- a/microbench/setup/run-benchmark
+++ b/microbench/setup/run-benchmark
@@ -4,15 +4,31 @@
 
 
 # Defaults
-SERVER=c09-45.sysnet.ucsd.edu
+SERVER=vrable2.sysnet.ucsd.edu
 MNTDIR=/mnt/bluesky
 
 BENCH_FILESIZE=$((1 << 12))
+BENCH_BLOCKSIZE=0
 BENCH_FILECOUNT=$((8))
 BENCH_WRITERATIO=1.0
 BENCH_THREADS=8
 BENCH_DURATION=120
 BENCH_OPS=100
+BENCH_INTERVALS=4
+BENCH_DIRSIZE=256
+BENCH_LOCKEDMEM=$((4096 - 256))
+NFS_BLOCKSIZE=1048576
+
+lock_memory() {
+    MEM=$1
+    while [ $MEM -gt 512 ]; do
+        /scratch/bluesky.git/microbench/lockmem 512 &
+        MEM=$(($MEM - 512))
+    done
+    if [ $MEM -gt 0 ]; then
+        /scratch/bluesky.git/microbench/lockmem $MEM &
+    fi
+}
 
 # Export any environment variables specified on the command line
 for e in "$@"; do
@@ -24,16 +40,11 @@ for e in "$@"; do
 done
 
 # Prepare to run the benchmark
-mount -t nfs -o vers=3,tcp,rw,soft,intr $SERVER:/export $MNTDIR
+lock_memory $BENCH_LOCKEDMEM
 
-pushd $MNTDIR
+mount -t nfs -o vers=3,tcp,rw,soft,intr,rsize=$NFS_BLOCKSIZE,wsize=$NFS_BLOCKSIZE $SERVER:/export $MNTDIR
 
-for t in $(seq 0 $(($BENCH_THREADS - 1))); do
-    mkdir t$t
-    for i in {0..$(($BENCH_FILECOUNT - 1))}; do
-        dd if=/dev/zero of=t$t/$i bs=$BENCH_FILESIZE count=1
-    done
-done
+pushd $MNTDIR >/dev/null
 
 /scratch/bluesky.git/microbench/mixedbench \
     $BENCH_FILESIZE \
@@ -41,8 +52,13 @@ done
     $BENCH_WRITERATIO \
     $BENCH_THREADS \
     $BENCH_DURATION \
-    $BENCH_OPS
+    $BENCH_OPS \
+    $BENCH_INTERVALS \
+    $BENCH_DIRSIZE \
+    $BENCH_BLOCKSIZE
+
+pkill -TERM lockmem
 
-popd
+popd >/dev/null
 
 umount -f $MNTDIR