Browse Source

2P write stuff

avadapal 2 years ago
parent
commit
6a943c4510
1 changed files with 21 additions and 5 deletions
  1. 21 5
      Docker/run-experiment.sh

+ 21 - 5
Docker/run-experiment.sh

@@ -89,14 +89,13 @@ date "+===== Start %s %F %T"
         date "+===== End %s %F %T"
     fi
 
-     if [ "$4" = "online" -a "$5" = "2P" ]; then
+     if [ "$1" = "read" -a "$5" = "2P" ]; then
         # Run, saving the output
-        savefilep2=$$.p2.out
         savefilep0=$$.p1.out
         savefilep1=$$.p0.out
-        docker exec -w /root/duoram/cpir-read/cxx duoram_p1 bash -c "$DUORAM_NUMA_P1 stdbuf -o 0  ./spir_test1  $p0addr $size $size 1 > $savefilep1 2>&1" &
-        sleep 2
-        docker exec -w /root/duoram/cpir-read/cxx duoram_p0 bash -c "$DUORAM_NUMA_P0 stdbuf -o 0  ./spir_test0  $p1addr $size $size 1 > $savefilep0 2>&1" &
+        docker exec -w /root/duoram/cpir-read/cxx duoram_p1 bash -c "$DUORAM_NUMA_P1 stdbuf -o 0  ./spir_test1  $p0addr $size $size 2 > $savefilep1 2>&1" &
+        sleep 4
+        docker exec -w /root/duoram/cpir-read/cxx duoram_p0 bash -c "$DUORAM_NUMA_P0 stdbuf -o 0  ./spir_test0  $p1addr $size $size 2 > $savefilep0 2>&1" &
         wait
         echo ===== P0 output
         docker exec -w /root/duoram/cpir-read/cxx duoram_p0 cat $savefilep0
@@ -105,4 +104,21 @@ date "+===== Start %s %F %T"
         docker exec -w /root/duoram/cpir-read/cxx duoram_p1 cat $savefilep1
         docker exec -w /root/duoram/cpir-read/cxx duoram_p1 rm -f $savefilep1
         date "+===== End %s %F %T"
+    fi
+
+    if [ "$1" = "write" -a "$5" = "2P" ]; then
+        # Run, saving the output
+        savefilep0=$$.p1.out
+        savefilep1=$$.p0.out
+        docker exec -w /root/duoram/2p-preprocessing duoram_p1 bash -c "$DUORAM_NUMA_P1 stdbuf -o 0  ./preprocessing1  $p0addr $size $iters > $savefilep1 2>&1" &
+        sleep 4
+        docker exec -w /root/duoram/2p-preprocessing duoram_p0 bash -c "$DUORAM_NUMA_P0 stdbuf -o 0  ./preprocessing1  $p1addr $size $iters > $savefilep0 2>&1" &
+        wait
+        echo ===== P0 output
+        docker exec -w /root/duoram/2p-preprocessing duoram_p0 cat $savefilep0
+        docker exec -w /root/duoram/2p-preprocessing duoram_p0 rm -f $savefilep0
+        echo ===== P1 output
+        docker exec -w /root/duoram/2p-preprocessing duoram_p1 cat $savefilep1
+        docker exec -w /root/duoram/2p-preprocessing duoram_p1 rm -f $savefilep1
+        date "+===== End %s %F %T"
     fi