Browse Source

run-experiments can be used with modes "read" or "bs"

Ian Goldberg 6 months ago
parent
commit
9e32ef44f2
1 changed files with 11 additions and 3 deletions
  1. 11 3
      run-experiment

+ 11 - 3
run-experiment

@@ -6,7 +6,7 @@ p1addr=$(docker inspect --format='{{ .NetworkSettings.IPAddress }}' floram_p1)
 
 # The Floram mode and size
 # mode is read, write, readwrite, or init
-mode=oram_read
+mode=read
 size=20
 iters=128
 port=3000
@@ -31,9 +31,17 @@ date "+===== Start %s %F %T"
 # Run, saving the output
 savefilep0=$$.p0.out
 savefilep1=$$.p1.out
-docker exec -w /root/floram-floram-release/build/tests floram_p0 bash -c "$FLORAM_NUMA_P0 stdbuf -o 0  ./bench_$mode -p $port -s $iters -o fssl_cprg -e $items -i 1 > $savefilep0 2>&1" &
+if [ "$mode" = "bs" ]; then
+    docker exec -w /root/floram-floram-release/build/tests floram_p0 bash -c "$FLORAM_NUMA_P0 stdbuf -o 0  ./bench_$mode -p $port -s $iters -o fssl_cprg -e $items -i 1 > $savefilep0 2>&1" &
+else
+    docker exec -w /root/floram-floram-release/build/tests floram_p0 bash -c "$FLORAM_NUMA_P0 stdbuf -o 0  ./bench_oram_$mode -p $port -s 8 -o fssl_cprg -e $items -i $iters > $savefilep0 2>&1" &
+fi
 sleep 2
-docker exec -w /root/floram-floram-release/build/tests floram_p1 bash -c "$FLORAM_NUMA_P1 stdbuf -o 0  ./bench_$mode -c $p0addr -p $port -s $iters -o fssl_cprg -e $items -i 1 > $savefilep1 2>&1" &
+if [ "$mode" = "bs" ]; then
+    docker exec -w /root/floram-floram-release/build/tests floram_p1 bash -c "$FLORAM_NUMA_P1 stdbuf -o 0  ./bench_$mode -c $p0addr -p $port -s $iters -o fssl_cprg -e $items -i 1 > $savefilep1 2>&1" &
+else
+    docker exec -w /root/floram-floram-release/build/tests floram_p1 bash -c "$FLORAM_NUMA_P1 stdbuf -o 0  ./bench_oram_$mode -c $p0addr -p $port -s 8 -o fssl_cprg -e $items -i $iters > $savefilep1 2>&1"
+fi
 wait
 echo ===== P0 output
 docker exec -w /root/floram-floram-release/build/tests floram_p0 cat $savefilep0