2P/3P flag

Docker/run-experiment.sh

@@ -47,44 +47,45 @@ items=$((1<<size))
 echo ===== Running duoram $mode $size $iters
 date "+===== Start %s %F %T"
 
-if [ "$4" = "online" ]; then
-    # Run, saving the output
-    savefilep2=$$.p2.out
-    savefilep0=$$.p1.out
-    savefilep1=$$.p0.out
-    docker exec -w /root/duoram/duoram-online duoram_p2 bash -c "$DUORAM_NUMA_P2 stdbuf -o 0  ./p2 $p0addr $p1addr $size $iters $iters $iters 1 > $savefilep2 2>&1" &
-    sleep 4
-    docker exec -w /root/duoram/duoram-online duoram_p1 bash -c "$DUORAM_NUMA_P1 stdbuf -o 0  ./duoram1  $p0addr $p2addr $size $iters $iters $iters 1 > $savefilep1 2>&1" &
-    sleep 2
-    docker exec -w /root/duoram/duoram-online duoram_p0 bash -c "$DUORAM_NUMA_P0 stdbuf -o 0  ./duoram0  $p1addr $p2addr $size $iters $iters $iters 1 > $savefilep0 2>&1" &
-    wait
-    echo ===== P0 output
-    docker exec -w /root/duoram/duoram-online duoram_p0 cat $savefilep0
-    docker exec -w /root/duoram/duoram-online duoram_p0 rm -f $savefilep0
-    echo ===== P1 output
-    docker exec -w /root/duoram/duoram-online duoram_p1 cat $savefilep1
-    docker exec -w /root/duoram/duoram-online duoram_p1 rm -f $savefilep1
-    date "+===== End %s %F %T"
-fi
-
+if ["$5" = "3P"]; then
 
+    if [ "$4" = "online" ]; then
+        # Run, saving the output
+        savefilep2=$$.p2.out
+        savefilep0=$$.p1.out
+        savefilep1=$$.p0.out
+        docker exec -w /root/duoram/duoram-online duoram_p2 bash -c "$DUORAM_NUMA_P2 stdbuf -o 0  ./p2 $p0addr $p1addr $size $iters $iters $iters 1 > $savefilep2 2>&1" &
+        sleep 4
+        docker exec -w /root/duoram/duoram-online duoram_p1 bash -c "$DUORAM_NUMA_P1 stdbuf -o 0  ./duoram1  $p0addr $p2addr $size $iters $iters $iters 1 > $savefilep1 2>&1" &
+        sleep 2
+        docker exec -w /root/duoram/duoram-online duoram_p0 bash -c "$DUORAM_NUMA_P0 stdbuf -o 0  ./duoram0  $p1addr $p2addr $size $iters $iters $iters 1 > $savefilep0 2>&1" &
+        wait
+        echo ===== P0 output
+        docker exec -w /root/duoram/duoram-online duoram_p0 cat $savefilep0
+        docker exec -w /root/duoram/duoram-online duoram_p0 rm -f $savefilep0
+        echo ===== P1 output
+        docker exec -w /root/duoram/duoram-online duoram_p1 cat $savefilep1
+        docker exec -w /root/duoram/duoram-online duoram_p1 rm -f $savefilep1
+        date "+===== End %s %F %T"
+    fi
 
-if [ "$4" = "preproc" ]; then
-    # Run, saving the output
-    savefilep2=$$.p2.out
-    savefilep0=$$.p1.out
-    savefilep1=$$.p0.out
-    docker exec -w /root/duoram/preprocessing duoram_p2 bash -c "$DUORAM_NUMA_P2 stdbuf -o 0  ./p2preprocessing $p0addr $p1addr $iters $size $modeval > $savefilep2 2>&1" &
-    sleep 4
-    docker exec -w /root/duoram/preprocessing duoram_p1 bash -c "$DUORAM_NUMA_P1 stdbuf -o 0  ./preprocessing1  $p0addr $p2addr $iters $size $modeval > $savefilep1 2>&1" &
-    sleep 2
-    docker exec -w /root/duoram/preprocessing duoram_p0 bash -c "$DUORAM_NUMA_P0 stdbuf -o 0  ./preprocessing0  $p1addr $p2addr $iters $size $modeval > $savefilep0 2>&1" &
-    wait
-    echo ===== P0 output
-    docker exec -w /root/duoram/preprocessing duoram_p0 cat $savefilep0
-    docker exec -w /root/duoram/preprocessing duoram_p0 rm -f $savefilep0
-    echo ===== P1 output
-    docker exec -w /root/duoram/preprocessing duoram_p1 cat $savefilep1
-    docker exec -w /root/duoram/preprocessing duoram_p1 rm -f $savefilep1
-    date "+===== End %s %F %T"
+    if [ "$4" = "preproc" ]; then
+        # Run, saving the output
+        savefilep2=$$.p2.out
+        savefilep0=$$.p1.out
+        savefilep1=$$.p0.out
+        docker exec -w /root/duoram/preprocessing duoram_p2 bash -c "$DUORAM_NUMA_P2 stdbuf -o 0  ./p2preprocessing $p0addr $p1addr $iters $size $modeval > $savefilep2 2>&1" &
+        sleep 4
+        docker exec -w /root/duoram/preprocessing duoram_p1 bash -c "$DUORAM_NUMA_P1 stdbuf -o 0  ./preprocessing1  $p0addr $p2addr $iters $size $modeval > $savefilep1 2>&1" &
+        sleep 2
+        docker exec -w /root/duoram/preprocessing duoram_p0 bash -c "$DUORAM_NUMA_P0 stdbuf -o 0  ./preprocessing0  $p1addr $p2addr $iters $size $modeval > $savefilep0 2>&1" &
+        wait
+        echo ===== P0 output
+        docker exec -w /root/duoram/preprocessing duoram_p0 cat $savefilep0
+        docker exec -w /root/duoram/preprocessing duoram_p0 rm -f $savefilep0
+        echo ===== P1 output
+        docker exec -w /root/duoram/preprocessing duoram_p1 cat $savefilep1
+        docker exec -w /root/duoram/preprocessing duoram_p1 rm -f $savefilep1
+        date "+===== End %s %F %T"
+    fi
 fi