merging

Docker/run-experiment.sh

@@ -52,9 +52,9 @@ date "+===== Start %s %F %T"
 
     if [ "$4" = "online" -a "$5" = "3P" ]; then
         # Run, saving the output
+        savefilep0=$$.p0.out
+        savefilep1=$$.p1.out
         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" &
@@ -67,6 +67,9 @@ date "+===== Start %s %F %T"
         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
+        echo ===== P2 output
+        docker exec -w /root/duoram/duoram-online duoram_p2 cat $savefilep2
+        docker exec -w /root/duoram/duoram-online duoram_p2 rm -f $savefilep2
         date "+===== End %s %F %T"
     fi
 
@@ -74,9 +77,9 @@ date "+===== Start %s %F %T"
 
     if [ "$4" = "preproc" -a "$5" = "3P" ]; then
         # Run, saving the output
+        savefilep0=$$.p0.out
+        savefilep1=$$.p1.out
         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 $ramsize > $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 $ramsize > $savefilep1 2>&1" &
@@ -89,13 +92,16 @@ date "+===== Start %s %F %T"
         echo ===== P1 output
         docker exec -w /root/duoram/preprocessing duoram_p1 cat $savefilep1
         docker exec -w /root/duoram/preprocessing duoram_p1 rm -f $savefilep1
+        echo ===== P2 output
+        docker exec -w /root/duoram/preprocessing duoram_p2 cat $savefilep2
+        docker exec -w /root/duoram/preprocessing duoram_p2 rm -f $savefilep2
         date "+===== End %s %F %T"
     fi
 
      if [ "$1" = "read" -a "$5" = "2P" ]; then
         # Run, saving the output
-        savefilep0=$$.p1.out
-        savefilep1=$$.p0.out
+        savefilep0=$$.p0.out
+        savefilep1=$$.p1.out
         docker exec -w /root/duoram/cpir-read/cxx duoram_p1 bash -c "$DUORAM_NUMA_P1 stdbuf -o 0  ./spir_test1  $p0addr $size $iters $iters $iters > $savefilep1 2>&1" &
         echo "P0 launched"
         sleep 4
@@ -113,9 +119,15 @@ date "+===== Start %s %F %T"
 
     if [ "$1" = "write" -a "$5" = "2P" -a "$4" = "preproc" ]; then
         # Run, saving the output
+<<<<<<< HEAD
         savefilep0=$$.p1.out
         savefilep1=$$.p0.out
         docker exec -w /root/duoram/2p-preprocessing duoram_p1 ./OT $p0addr $p1addr 1  $((128*iters*size*3))  &
+=======
+        savefilep0=$$.p0.out
+        savefilep1=$$.p1.out
+        docker exec -w /root/duoram/2p-preprocessing duoram_p1 ./OT $p0addr $p1addr 1  128 * $iters * $size &
+>>>>>>> 4628c17c34e5930db2f64e662fbe9615f59af64c
         echo "P1 launched"
         sleep 1
         docker exec -w /root/duoram/2p-preprocessing duoram_p0 ./OT $p0addr $p1addr 0  $((128*iters*size*3))  &
@@ -136,8 +148,8 @@ date "+===== Start %s %F %T"
 
     if [ "$1" = "write" -a "$5" = "2P" -a "$4" = "online" ]; then
         # Run, saving the output
-        savefilep0=$$.p1.out
-        savefilep1=$$.p0.out
+        savefilep0=$$.p0.out
+        savefilep1=$$.p1.out
         docker exec -w /root/duoram/duoram-online duoram_p1 bash -c "$DUORAM_NUMA_P1 stdbuf -o 0  ./2Pduoram1 $p0addr $p2addr $size $iters $iters $iters 1  > $savefilep1 2>&1" &
         sleep 4
         docker exec -w /root/duoram/duoram-online duoram_p0 bash -c "$DUORAM_NUMA_P0 stdbuf -o 0  ./2Pduoram0 $p1addr $p2addr $size $iters $iters $iters 1  > $savefilep0 2>&1" &
@@ -149,4 +161,4 @@ date "+===== Start %s %F %T"
         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
+    fi